Merge lp:~therp-nl/openobject-addons/lp1107889_supplier_invoice_rounding into lp:openobject-addons

[Ronald Portier (Therp)]

Fixes lp1107889.

Also stores tax rounding method used with the invoice, so guaranteeing full accountability of the amounts computed, even for sales invoices. Because the company default rounding method might change over time..

Unmerged revisions

8523. By Ronald Portier (Therp) on 2013-02-08

[FIX] Change order of files in __init__.py to prevent problems on
      update of databases that do not already have the field
      tax_calculation_rounding_method in res_company.

8522. By Ronald Portier (Therp) on 2013-01-29

[FIX] lp1107889 Add needed choice of rounding method to supplier invoice.

=== modified file 'account/__init__.py'
--- account/__init__.py	2012-11-29 22:26:45 +0000
+++ account/__init__.py	2013-02-08 14:32:28 +0000
@@ -23,6 +23,7 @@
 import account
 import installer
 import project
+import company
 import account_invoice
 import account_bank_statement
 import account_bank
@@ -34,7 +35,6 @@
 import report
 import product
 import ir_sequence
-import company
 import res_currency
 import edi
 import res_config

=== modified file 'account/account.py'
--- account/account.py	2013-01-29 13:34:27 +0000
+++ account/account.py	2013-02-08 14:32:28 +0000
@@ -2066,7 +2066,9 @@
                 cur_price_unit+=amount2
         return res
 
-    def compute_all(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None, force_excluded=False):
+    def compute_all(
+            self, cr, uid, taxes, price_unit, quantity, product=None,
+            partner=None, force_excluded=False, context=None):
         """
         :param force_excluded: boolean used to say that we don't want to consider the value of field price_include of
             tax. It's used in encoding by line where you don't matter if you encoded a tax with that boolean to True or
@@ -2077,7 +2079,6 @@
                 'taxes': []                  # List of taxes, see compute for the format
             }
         """
-
         # By default, for each tax, tax amount will first be computed
         # and rounded at the 'Account' decimal precision for each
         # PO/SO/invoice line and then these rounded amounts will be
@@ -2089,7 +2090,11 @@
         # rounding after the sum of the tax amounts of each line
         precision = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
         tax_compute_precision = precision
-        if taxes and taxes[0].company_id.tax_calculation_rounding_method == 'round_globally':
+        rounding_method = (
+            (context and context.get('tax_calculation_rounding_method'))
+            or (taxes and taxes[0].company_id.tax_calculation_rounding_method)
+            or 'round_per_line')
+        if  rounding_method == 'round_globally':
             tax_compute_precision += 5
         totalin = totalex = float_round(price_unit * quantity, precision)
         tin = []

=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2013-01-05 23:29:19 +0000
+++ account/account_invoice.py	2013-02-08 14:32:28 +0000
@@ -286,8 +286,40 @@
         'payment_ids': fields.function(_compute_lines, relation='account.move.line', type="many2many", string='Payments'),
         'move_name': fields.char('Journal Entry', size=64, readonly=True, states={'draft':[('readonly',False)]}),
         'user_id': fields.many2one('res.users', 'Salesperson', readonly=True, track_visibility='onchange', states={'draft':[('readonly',False)]}),
-        'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position', readonly=True, states={'draft':[('readonly',False)]})
-    }
+        'fiscal_position': fields.many2one('account.fiscal.position',
+            'Fiscal Position', readonly=True,
+            states={'draft':[('readonly',False)]}),
+        'tax_calculation_rounding_method': fields.selection([
+            ('round_per_line', 'Round per line'),
+            ('round_globally', 'Round globally'),
+            ], 'Tax calculation rounding method',
+            help='''If you select 'Round per line' : for each tax, the tax
+amount will first be computed and rounded for each PO/SO/invoice line and then
+these rounded amounts will be summed, leading to the total amount for that tax.
+If you select 'Round globally': for each tax, the tax amount will be computed
+for each PO/SO/invoice line, then these amounts will be summed and eventually
+this total tax amount will be rounded. If you sell with tax included, you
+should choose 'Round per line' because you certainly want the sum of your
+tax-included line subtotals to be equal to the total amount with taxes.'''),
+     }
+
+    def _get_company_rounding(self, cr, uid, company_id, context=None):
+        res = 'round_per_line'
+        if  company_id:
+            company_model = self.pool.get('res.company')
+            company_obj = company_model.browse(
+                cr, uid, company_id, context=context)
+            if  company_obj and company_obj['tax_calculation_rounding_method']:
+                res = company_obj['tax_calculation_rounding_method']
+        return res
+
+    def _get_default_rounding_method(self, cr, uid, context=None):
+        # default rounding depends on company. We start with default company
+        company_model = self.pool.get('res.company')
+        company_id = company_model._company_default_get(
+            cr, uid, 'account.invoice', context=context)
+        return self._get_company_rounding(cr, uid, company_id, context)
+
     _defaults = {
         'type': _get_type,
         'state': 'draft',
@@ -299,6 +331,7 @@
         'internal_number': False,
         'user_id': lambda s, cr, u, c: u,
         'sent': False,
+        'tax_calculation_rounding_method': _get_default_rounding_method,
     }
     _sql_constraints = [
         ('number_uniq', 'unique(number, company_id, journal_id, type)', 'Invoice Number must be unique per Company!'),
@@ -566,6 +599,9 @@
         obj_journal = self.pool.get('account.journal')
         account_obj = self.pool.get('account.account')
         inv_line_obj = self.pool.get('account.invoice.line')
+        if  company_id:
+            val['tax_calculation_rounding_method'] = (
+                self._get_company_rounding(cr, uid, company_id))
         if company_id and part_id and type:
             acc_id = False
             partner_obj = self.pool.get('res.partner').browse(cr,uid,part_id)
@@ -1342,9 +1378,16 @@
         res = {}
         tax_obj = self.pool.get('account.tax')
         cur_obj = self.pool.get('res.currency')
+        local_context = {}
         for line in self.browse(cr, uid, ids):
-            price = line.price_unit * (1-(line.discount or 0.0)/100.0)
-            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)
+            local_context['tax_calculation_rounding_method'] = (
+                    line.invoice_id.tax_calculation_rounding_method)
+            price = line.price_unit * (1 - (line.discount or 0.0) / 100.0)
+            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,
+                context=local_context)
             res[line.id] = taxes['total']
             if line.invoice_id:
                 cur = line.invoice_id.currency_id
@@ -1521,16 +1564,19 @@
         inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id, context=context)
         company_currency = inv.company_id.currency_id.id
 
+        local_context = {}
         for line in inv.invoice_line:
+            local_context['tax_calculation_rounding_method'] = (
+                    line.invoice_id.tax_calculation_rounding_method)
             mres = self.move_line_get_item(cr, uid, line, context)
             if not mres:
                 continue
             res.append(mres)
             tax_code_found= False
             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)),
-                    line.quantity, line.product_id,
-                    inv.partner_id)['taxes']:
+                (line.price_unit * (1.0 - (line['discount'] or 0.0) / 100.0)),
+                 line.quantity, line.product_id, inv.partner_id,
+                 context=local_context)['taxes']:
 
                 if inv.type in ('out_invoice', 'in_invoice'):
                     tax_code_id = tax['base_code_id']
@@ -1659,6 +1705,7 @@
         'base_amount': 0.0,
         'tax_amount': 0.0,
     }
+
     def compute(self, cr, uid, invoice_id, context=None):
         tax_grouped = {}
         tax_obj = self.pool.get('account.tax')
@@ -1667,8 +1714,16 @@
         cur = inv.currency_id
         company_currency = inv.company_id.currency_id.id
 
+        local_context = {}
         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']:
+            local_context['tax_calculation_rounding_method'] = (
+                    line.invoice_id.tax_calculation_rounding_method)
+            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,
+                    context=local_context)['taxes']:
+
                 val={}
                 val['invoice_id'] = inv.id
                 val['name'] = tax['name']

=== modified file 'account/account_invoice_view.xml'
--- account/account_invoice_view.xml	2013-02-05 13:38:55 +0000
+++ account/account_invoice_view.xml	2013-02-08 14:32:28 +0000
@@ -180,6 +180,7 @@
                         <group>
                             <field name="date_invoice"/>
                             <field name="date_due"/>
+                            <field name="tax_calculation_rounding_method"/>
                             <field domain="[('company_id', '=', company_id), ('type', '=', 'payable')]"
                                 name="account_id" groups="account.group_account_user"/>
                             <field name="journal_id" groups="account.group_account_user"
@@ -343,6 +344,9 @@
                         </group>
                     </group>
                     <field name="sent" invisible="1"/>
+                    <field
+                        name="tax_calculation_rounding_method"
+                        invisible="1" />
                     <notebook colspan="4">
                         <page string="Invoice Lines">
                             <field name="invoice_line" nolabel="1" widget="one2many_list" context="{'type': type}">