[MERGE] procurement workflow fixes + removal of a unused file hr_payroll_account...
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Tue, 18 Dec 2012 16:11:36 +0000 (17:11 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Tue, 18 Dec 2012 16:11:36 +0000 (17:11 +0100)
bzr revid: qdp-launchpad@openerp.com-20121218161136-dqcinl0gputptkt3

1  2 
addons/mrp/procurement.py
addons/procurement/procurement.py
addons/purchase/purchase.py

Simple merge
Simple merge
Simple merge