ACCOUNT: add product_id to analytic line create by invoice

bzr revid: ced-142ece071666d4af98da79e324f63abee2c804b7

diff --git a/addons/account/invoice.py b/addons/account/invoice.py
index 52290d3..97b135f 100644 (file)
--- a/addons/account/invoice.py
+++ b/addons/account/invoice.py
@@ -590,7 +590,9 @@ class account_invoice_line(osv.osv):
                                'price_unit':line.price_unit, 
                                'quantity':line.quantity, 
                                'price':cur_obj.round(cr, uid, cur, line.quantity*line.price_unit * (1.0- (line.discount or 0.0)/100.0)),
-                               'account_id':line.account_id.id
+                               'account_id':line.account_id.id,
+                               'product_id':line.product_id.id,
+                               'uos_id':line.uos_id.id,
                        })
                        for tax in tax_obj.compute(cr, uid, line.invoice_line_tax_id, (line.price_unit *(1.0-(line['discount'] or 0.0)/100.0)), line.quantity, inv.address_invoice_id.id, line.product_id, inv.partner_id):
                                val={}

diff --git a/addons/account_tax_include/invoice_tax_incl.py b/addons/account_tax_include/invoice_tax_incl.py
index 5c2cadb..0587c95 100644 (file)
--- a/addons/account_tax_include/invoice_tax_incl.py
+++ b/addons/account_tax_include/invoice_tax_incl.py
@@ -102,6 +102,8 @@ class account_invoice_line(osv.osv):
                                'quantity':line.quantity, 
                                'price':cur_obj.round(cr, uid, cur, line.quantity*line.price_unit * (1.0- (line.discount or 0.0)/100.0)),
                                'account_id':line.account_id.id,
+                               'product_id':line.product_id.id,
+                               'uos_id':line.uos_id.id,
                        })
                        for tax in tax_obj.compute_inv(cr, uid, line.invoice_line_tax_id, (line.price_unit *(1.0-(line['discount'] or 0.0)/100.0)), line.quantity, inv.address_invoice_id.id, line.product_id, inv.partner_id):
                                val={}