[MERGE] From Joel GrandGuillaume (Camp2Camp)
authorStephane Wirtel <stephane@openerp.com>
Thu, 25 Mar 2010 13:35:24 +0000 (14:35 +0100)
committerStephane Wirtel <stephane@openerp.com>
Thu, 25 Mar 2010 13:35:24 +0000 (14:35 +0100)
commit147e1f2c831de5127af61d62e7e35ea2a952f0e2
treefaf8801fd3d8d44bc3802d309940c49660818385
parentf0bfaff07a0338d7cce317e767d36aa83cbc3913
parent942ac8de0bdf91cd528bd4524e57cb6261ecf713
[MERGE] From Joel GrandGuillaume (Camp2Camp)

bzr revid: stephane@openerp.com-20100325133524-bopyjvq6dr6xq0xr
addons/account/account_analytic_line.py
addons/hr_expense/hr_expense.py
addons/product/product.py
addons/stock/stock.py
addons/stock/wizard/wizard_partial_picking.py