Merge lp:~openerp-dev/openobject-addons/6.0-opw-51238-skh into lp:openobject-addons/6.0

[Somesh Khare]

Hello Sir,

Scenario:
     Create two service type product, prestations, régie.
        1. Select the timesheet tab on the Employee "Admin" form and select the product "prestations" , who have no 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. Invoice has no taxes for the product "régie".

[Fix]: This branch fixes this issue.

Kindly review the branch and share your views on it.

Thanks,
Somesh Khare

[lp:~openerp-dev/openobject-addons/6.0-opw-51238-skh]

4975. By Launchpad Translations on behalf of openerp on 2011-12-24

Launchpad automatic translations update.

4976. By Launchpad Translations on behalf of openerp on 2011-12-25

Launchpad automatic translations update.

4977. By Launchpad Translations on behalf of openerp on 2011-12-27

Launchpad automatic translations update.

4978. By Launchpad Translations on behalf of openerp on 2011-12-28

Launchpad automatic translations update.

4979. By Launchpad Translations on behalf of openerp on 2011-12-29

Launchpad automatic translations update.

4980. By Somesh Khare on 2011-12-29

[IMP]]hr_timesheet_invoice_create: Invoice line product did not have taxes given by the wizard(Ref: Case 51238)

[Naresh(OpenERP) (nch-openerp)]

review: Approve

=== modified file 'hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py'
--- hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py	2011-04-21 07:45:29 +0000
+++ hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py	2011-12-29 12:42:24 +0000
@@ -120,15 +120,16 @@
                     raise osv.except_osv(_('Error'), _('At least one line has no product !'))
                 factor_name = ''
                 factor = invoice_factor_obj.browse(cr, uid, factor_id, context2)
-
                 if not data['product']:
                     if factor.customer_name:
                         factor_name = product.name+' - '+factor.customer_name
                     else:
                         factor_name = product.name
+                    taxes = product.taxes_id
                 else:
                     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})
                 if account.pricelist_id:
@@ -136,8 +137,6 @@
                     price = pro_price_obj.price_get(cr,uid,[pl], data['product'] or product_id, qty or 1.0, account.partner_id.id, context=ctx)[pl]
                 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
                 curr_line = {