[MERGE]
authoruco (OpenERP) <uco@tinyerp.com>
Mon, 18 Oct 2010 07:43:41 +0000 (13:13 +0530)
committeruco (OpenERP) <uco@tinyerp.com>
Mon, 18 Oct 2010 07:43:41 +0000 (13:13 +0530)
commitf8eb6b01840f079db55f2c7c6249a78b7b2c6ca0
treec9e9a394df48cce1c00f3e54e6ad998112e0558d
parent201b94bd38f22e96bd7880596876db820274aeb0
parentaeda125c09a1bb03951abb94ad6b803a51fc5a5b
[MERGE]

bzr revid: uco@tinyerp.com-20101018074341-zh2lchjja6kzwnco
12 files changed:
addons/account/account_invoice_view.xml
addons/account/invoice.py
addons/hr_evaluation/hr_evaluation.py
addons/mrp/mrp.py
addons/mrp/mrp_view.xml
addons/mrp/procurement.py
addons/mrp/report/mrp_production_order_view.xml
addons/mrp/report/mrp_report_view.xml
addons/mrp_operations/mrp_operations_view.xml
addons/purchase/purchase.py
addons/resource/resource_view.xml
addons/stock/stock.py