[MERGE] merged with main trunk (revision 9186)
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Fri, 28 Feb 2014 13:15:16 +0000 (14:15 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Fri, 28 Feb 2014 13:15:16 +0000 (14:15 +0100)
commite36b32a66151ef29a049057324b18a754974b0e0
tree2f17cd76f8604888ca0a51688b6bde1a764df473
parent536f2bded92593c00bf2d5c8000cae6c5e1e2ed9
parent7851c9f825f0e1133b928ce66bc7d3d6056b54da
[MERGE] merged with main trunk (revision 9186)

bzr revid: qdp-launchpad@openerp.com-20140228131516-ihigousbe5p1nt68
22 files changed:
addons/mrp/__openerp__.py
addons/mrp/procurement.py
addons/mrp/test/order_process.yml
addons/point_of_sale/point_of_sale.py
addons/point_of_sale/point_of_sale_view.xml
addons/purchase/__openerp__.py
addons/purchase/purchase_view.xml
addons/purchase/report/__init__.py
addons/purchase/report/purchase_report.py
addons/purchase/report/purchase_report_view.xml
addons/purchase/views/report_purchaseorder.xml
addons/purchase/views/report_purchasequotation.xml
addons/purchase_requisition/__openerp__.py
addons/purchase_requisition/purchase_requisition_report.xml
addons/purchase_requisition/test/purchase_requisition.yml
addons/purchase_requisition/views/report_purchaserequisition.xml
addons/sale/__openerp__.py
addons/sale/sale.py
addons/sale/sale_view.xml
addons/sale_stock/sale_stock_view.xml
addons/sale_stock/test/picking_order_policy.yml
addons/stock/product.py