Merge lp:~camptocamp/ocb-addons/ocb-addons-hr_expense-tax_vre into lp:ocb-addons

[Vincent Renaville@camptocamp]

[Holger Brunn (Therp) (hbrunn)]

I had difficulty reading #9
Is this the same as to say

if tax['amount'] * tax['base_sign'] or tax['tax_code_id']:

If yes, I'd propose to change it that way for readability.

review: Needs Information

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

Thanks for the review Holger

Plus it differs from OPW
https://code.launchpad.net/~openerp-dev/openobject-addons/7.0-opw-596243-han/+merge/182269

So I put it in need fixing and work in progress

I'll see with Vincent to fix this.

review: Needs Fixing (differ from opw)

[Vincent Renaville@camptocamp (vrenaville-c2c)]

Hello,

I have put a comment on the related merge proposal in V7.

It doesn't take care of Taxe included if one it set on a product.

So I do a resubmit with an improved patch

[Holger Brunn (Therp) (hbrunn)]

please also link the bug report to this branch

review: Approve (code review)

[Yannick Vaucher @ Camptocamp (yvaucher-c2c)]

review: Approve

=== modified file 'hr_expense/hr_expense.py'
--- hr_expense/hr_expense.py	2013-09-09 08:02:09 +0000
+++ hr_expense/hr_expense.py	2013-11-21 14:42:04 +0000
@@ -297,6 +297,7 @@
             if not mres:
                 continue
             res.append(mres)
+            current_product_line_pos = len(res) - 1
             tax_code_found= False
             
             #Calculate tax according to default tax on product
@@ -340,18 +341,20 @@
                 is_price_include = tax_obj.read(cr,uid,tax['id'],['price_include'],context)['price_include']
                 if is_price_include:
                     ## We need to deduce the price for the tax
-                    res[-1]['price'] = res[-1]['price']  - (tax['amount'] * tax['base_sign'] or 0.0)
-                assoc_tax = {
-                             'type':'tax',
-                             'name':tax['name'],
-                             'price_unit': tax['price_unit'],
-                             'quantity': 1,
-                             'price':  tax['amount'] * tax['base_sign'] or 0.0,
-                             'account_id': tax['account_collected_id'] or mres['account_id'],
-                             'tax_code_id': tax['tax_code_id'],
-                             'tax_amount': tax['amount'] * tax['base_sign'],
-                             }
-                res.append(assoc_tax)
+                    res[current_product_line_pos]['price'] = res[current_product_line_pos]['price']  - (-(tax['amount'] * tax['base_sign'] or 0.0))
+                #Will create the tax here as we don't have the access
+                if (tax['amount'] * tax['base_sign'] or 0.0) or (tax['tax_code_id'] != False ): 
+                    assoc_tax = {
+                                 'type':'tax',
+                                 'name':tax['name'],
+                                 'price_unit': tax['price_unit'],
+                                 'quantity': 1,
+                                 'price':  -(tax['amount'] * tax['base_sign'] or 0.0),
+                                 'account_id': tax['account_collected_id'] or mres['account_id'],
+                                 'tax_code_id': tax['tax_code_id'],
+                                 'tax_amount': tax['amount'] * tax['base_sign'],
+                                 }
+                    res.append(assoc_tax)
         return res
 
     def move_line_get_item(self, cr, uid, line, context=None):