Merge lp:~akretion-team/openobject-addons/trunk_addons_ref_unit_price into lp:openobject-addons

[Benoit Guillot - http://www.akretion.com]

Hello,

This merge adds a method : _unit_price_with_discount() in the class sale_order_line and account_invoice_line.
This method calculate the unit price with the discount

It allows us to override this method in order to customize the unit price.
For instance to round the unit price with discount in order to fix rounding issues.

Best regards,

[Victor Tabuenca (OpenERP) (vta-openerp)]

I'm not able to see whatever you've done. Please fix it.

review: Needs Fixing

[Benoit Guillot - http://www.akretion.com (benoit-guillot-z)]

It took time to upload the branch, it is done now.

[Victor Tabuenca (OpenERP) (vta-openerp)]

Ok, thanks.

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

Any news on this one, I've got another merge that is waiting on this : https://code.launchpad.net/~akretion-team/sale-wkfl/sale-wkfl_discount_per_unit/+merge/138192

Thanks for the update !

[Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c)]

Still no news ?

Unmerged revisions

8213. By Benoit Guillot - http://www.akretion.com on 2012-12-05

[REF] add a method to calculate the unti price with the discount in sale order and account invoice.

=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2012-12-05 11:28:53 +0000
+++ account/account_invoice.py	2012-12-05 15:12:37 +0000
@@ -1354,7 +1354,7 @@
         tax_obj = self.pool.get('account.tax')
         cur_obj = self.pool.get('res.currency')
         for line in self.browse(cr, uid, ids):
-            price = line.price_unit * (1-(line.discount or 0.0)/100.0)
+            price = self._unit_price_with_discount(cr, uid, line, context=unknow_dict)
             taxes = tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, price, line.quantity, product=line.product_id, partner=line.invoice_id.partner_id)
             res[line.id] = taxes['total']
             if line.invoice_id:
@@ -1414,6 +1414,10 @@
         'price_unit': _price_unit_default,
         'account_id': _default_account_id,
     }
+    
+    def _unit_price_with_discount(self, cr, uid, line, context=None):
+        price = line.price_unit * (1 - (line.discount or 0.0) / 100.0)
+        return price
 
     def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False):
         if context is None:
@@ -1539,8 +1543,9 @@
                 continue
             res.append(mres)
             tax_code_found= False
+            price = self._unit_price_with_discount(cr, uid, line, context=context)
             for tax in tax_obj.compute_all(cr, uid, line.invoice_line_tax_id,
-                    (line.price_unit * (1.0 - (line['discount'] or 0.0) / 100.0)),
+                    price,
                     line.quantity, line.product_id,
                     inv.partner_id)['taxes']:
 
@@ -1680,7 +1685,8 @@
         company_currency = inv.company_id.currency_id.id
 
         for line in inv.invoice_line:
-            for tax in tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, (line.price_unit* (1-(line.discount or 0.0)/100.0)), line.quantity, line.product_id, inv.partner_id)['taxes']:
+            price = self.pool.get('account.invoice.line')._unit_price_with_discount(cr, uid, line, context=context)
+            for tax in tax_obj.compute_all(cr, uid, line.invoice_line_tax_id, price, line.quantity, line.product_id, inv.partner_id)['taxes']:
                 val={}
                 val['invoice_id'] = inv.id
                 val['name'] = tax['name']

=== modified file 'sale/sale.py'
--- sale/sale.py	2012-12-04 14:46:49 +0000
+++ sale/sale.py	2012-12-05 15:12:37 +0000
@@ -73,7 +73,8 @@
 
     def _amount_line_tax(self, cr, uid, line, context=None):
         val = 0.0
-        for c in self.pool.get('account.tax').compute_all(cr, uid, line.tax_id, line.price_unit * (1-(line.discount or 0.0)/100.0), line.product_uom_qty, line.product_id, line.order_id.partner_id)['taxes']:
+        price = self.pool.get('sale.order.line')._unit_price_with_discount(cr, uid, line, context=context)
+        for c in self.pool.get('account.tax').compute_all(cr, uid, line.tax_id, price, line.product_uom_qty, line.product_id, line.order_id.partner_id)['taxes']:
             val += c.get('amount', 0.0)
         return val
 
@@ -682,7 +683,7 @@
         if context is None:
             context = {}
         for line in self.browse(cr, uid, ids, context=context):
-            price = line.price_unit * (1 - (line.discount or 0.0) / 100.0)
+            price = self._unit_price_with_discount(cr, uid, line, context=context)
             taxes = tax_obj.compute_all(cr, uid, line.tax_id, price, line.product_uom_qty, line.product_id, line.order_id.partner_id)
             cur = line.order_id.pricelist_id.currency_id
             res[line.id] = cur_obj.round(cr, uid, cur, taxes['total'])
@@ -753,6 +754,10 @@
         'type': 'make_to_stock',
         'price_unit': 0.0,
     }
+    
+    def _unit_price_with_discount(self, cr, uid, line, context=None):
+        price = line.price_unit * (1 - (line.discount or 0.0) / 100.0)
+        return price
 
     def _get_line_qty(self, cr, uid, line, context=None):
         if (line.order_id.invoice_quantity=='order'):