Merge lp:~openerp-dev/openobject-addons/6.1-opw-51238-rgo into lp:openobject-addons/6.1

[Ravi Gohil (OpenERP)]

Hello,

This fix has been forward ported from lp:~openerp-dev/openobject-addons/6.0-opw-51238-skh

Scenario:
Create two service type products, prestations, régie.
1. Select the timesheet tab on the Employee "Admin" form and select the product "prestations" , which has't got any taxes
2. Give the taxes on the Product "régie" (basic taxes for sales and purchase)
3. The user "Admin" do a sign in and a sign out from the " Human Resources/Attendances/Sign in / Sign out by project".

When you run the wizard for Billing Data from "Accounting/Periodical Processing/Billing/Bill Tasks Works", it creates a invoice for the product, which you provided on the Wizard form. but, invoice has no taxes for the product "régie".

This branch fixes this issue, kindly review the branch.

Thanks.

Unmerged revisions

7134. By Ravi Gohil (OpenERP) on 2013-01-25

[FIX] hr_timesheet_invoice: Invoice line product did not have taxes given by the wizard. (Maintenance Case: 51238)

=== modified file 'hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py'
--- hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py	2011-11-16 14:59:58 +0000
+++ hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py	2013-01-25 10:26:28 +0000
@@ -113,9 +113,11 @@
                         factor_name = product.name+' - '+factor.customer_name
                     else:
                         factor_name = product.name
+                    taxes = product.taxes_id
                 else:
                     data['product'] = data['product'][0]
                     factor_name = product_obj.name_get(cr, uid, [data['product']], context=context)[0][1]
+                    taxes = product_obj.browse(cr,uid,data['product'],context).taxes_id
 
                 ctx =  context.copy()
                 ctx.update({'uom':uom})
@@ -125,7 +127,6 @@
                 else:
                     price = 0.0
 
-                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: