Merge lp:~openerp-dev/openobject-addons/6.1-opw-584776-han into lp:openobject-addons/6.1

[Hardik Ansodariya (OpenERP)]

Hello,

Fixed the issue of periodical billing.

When we created an invoice from an account analytic line. If we use another product with a different taxes, this one isn't set in the invoice.

Steps:

Accounting > Periodical Processing > Billing > Bill Tasks Works

Create Bill Tasks works.

Now create invoice from wizard > select another product than selected in Bill task works.

Taxes of new product will be taken into consideration in created invoice.

This branch fixes the issue.

=== 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-02-26 06:28:22 +0000
@@ -124,8 +124,11 @@
                     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
-
-                taxes = product.taxes_id
+                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
                 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: