[MERGE] forward port of branch 7.0 up to 00ec786
authorDenis Ledoux <dle@odoo.com>
Tue, 28 Oct 2014 12:40:17 +0000 (13:40 +0100)
committerDenis Ledoux <dle@odoo.com>
Tue, 28 Oct 2014 12:40:17 +0000 (13:40 +0100)
commita6024a6376160a78017e3de94100aa8c95bd41a5
treef43e37b7eb481f1afcd3b547b21f4720a34b228b
parentd68d1d0434e870b7fed39665be2d8c33afe07eb6
parent00ec786e487ee79e6edaa29aa8bb3d4ccd028779
[MERGE] forward port of branch 7.0 up to 00ec786
addons/account/account_invoice.py
addons/hr_timesheet_invoice/report/account_analytic_profit.py
addons/product_visible_discount/product_visible_discount.py
addons/sale_margin/sale_margin.py
addons/stock/wizard/stock_partial_picking_view.xml