[MERGE] OPW 584776: hr_timesheet_invoice: use right product for invoice taxes when...

[odoo/odoo.git] / addons / hr_timesheet_invoice / wizard / hr_timesheet_invoice_create.py

diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
index 8d68d08..dc5fd48 100644 (file)
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
@@ -115,6 +115,7 @@ class account_analytic_line(osv.osv):
                         factor_name = product.name
                 else:
                     data['product'] = data['product'][0]
+                    product = product_obj.browse(cr, uid, data['product'], context=context2)
                     factor_name = product_obj.name_get(cr, uid, [data['product']], context=context)[0][1]
 
                 ctx =  context.copy()
@@ -124,11 +125,8 @@ class account_analytic_line(osv.osv):
                     price = pro_price_obj.price_get(cr,uid,[pl], data.get('product', False) or product_id, qty or 1.0, account.partner_id.id, context=ctx)[pl]
                 else:
                     price = 0.0
-                product_tax = product_obj.browse(cr, uid, data.get('product', product_id), context=context)
-                if data.get('product', product_id):
-                    taxes = product_tax.taxes_id
-                else:
-                    taxes = product.taxes_id
+
+                taxes = product.taxes_id
                 tax = fiscal_pos_obj.map_tax(cr, uid, account.partner_id.property_account_position, taxes)
                 account_id = product.product_tmpl_id.property_account_income.id or product.categ_id.property_account_income_categ.id
                 if not account_id: