[MERGE] forward port of branch 7.0 up to 095be21
authorDenis Ledoux <dle@odoo.com>
Wed, 6 Aug 2014 11:06:20 +0000 (13:06 +0200)
committerDenis Ledoux <dle@odoo.com>
Wed, 6 Aug 2014 11:06:20 +0000 (13:06 +0200)
commit978fd47261d3a6cb6e39053892fb291bf61b511c
tree2b0d01465a731fbc53e4d27678d31ea69b869672
parentc45c2eb58eef5f62e32a7987a8b9a71c134a2a24
parent095be21ab17f7f731877d61c99b48b51119ff39a
[MERGE] forward port of branch 7.0 up to 095be21
addons/account/edi/invoice_action_data.xml
addons/analytic/analytic.py
addons/point_of_sale/point_of_sale_view.xml
addons/portal_claim/portal_claim.py
addons/portal_sale/portal_sale_data.xml
addons/purchase/edi/purchase_order_action_data.xml
addons/sale/edi/sale_order_action_data.xml
addons/stock/stock.py