[MERGE] main trunk
authorQuentin (OpenERP) <qdp-launchpad@openerp.com>
Mon, 3 Feb 2014 17:30:00 +0000 (18:30 +0100)
committerQuentin (OpenERP) <qdp-launchpad@openerp.com>
Mon, 3 Feb 2014 17:30:00 +0000 (18:30 +0100)
commit753f7541db67d03e85bde6eb1c56ef2bb7468c7f
treeef621e6370d1c6b6ce3f60f990c5b03cbe086d60
parent3d392cab4ec961b9d5d3e65f79f146d0bc5e1aa6
parentc25827f84544b6ea3004c7a354122284310c528b
[MERGE] main trunk

bzr revid: qdp-launchpad@openerp.com-20140203173000-mk092iw2wz3y0e3e
32 files changed:
addons/delivery/delivery_demo.xml
addons/delivery/sale.py
addons/event_sale/event_sale_view.xml
addons/mrp/mrp.py
addons/mrp/mrp_view.xml
addons/mrp/security/ir.model.access.csv
addons/multi_company/multi_company_demo.xml
addons/point_of_sale/point_of_sale.py
addons/point_of_sale/point_of_sale_view.xml
addons/point_of_sale/security/ir.model.access.csv
addons/portal_stock/security/ir.model.access.csv
addons/portal_stock/security/portal_security.xml
addons/product/product.py
addons/product/product_view.xml
addons/product/security/ir.model.access.csv
addons/purchase/board_purchase_view.xml
addons/purchase/purchase.py
addons/purchase/purchase_view.xml
addons/purchase/report/purchase_report.py
addons/purchase/report/purchase_report_view.xml
addons/purchase/test/process/run_scheduler.yml
addons/purchase_requisition/wizard/purchase_requisition_partner.py
addons/sale/sale.py
addons/sale/sale_view.xml
addons/sale_stock/res_config.py
addons/sale_stock/res_config_view.xml
addons/sale_stock/sale_stock.py
addons/sale_stock/sale_stock_view.xml
addons/stock/product_view.xml
addons/stock/stock_demo.xml
addons/stock/stock_view.xml
addons/stock_account/product_view.xml