Merge lp:~akretion-team/openobject-addons/trunk-add-tax-rounding-option into lp:openobject-addons

[Alexis de Lattre]

This merge proposal replaces this first merge proposal :

https://code.launchpad.net/~akretion-team/openobject-addons/trunk-addons-tax-calculation-decimal-precision/+merge/103579

It implements the suggestion that Fabien wrote in the comments of the first merge proposal to have a simple option "round per line"/"round globally".

[Lorenzo Battistini (elbati)]

Hello Alexis, please consider adding the YAML tests I already did for my patch

tests: http://bazaar.launchpad.net/~openerp-community/openobject-addons/fix-account-trunk-tax-computation-method/view/head:/account/test/tax_computation.yml
patch: https://code.launchpad.net/~openerp-community/openobject-addons/fix-account-trunk-tax-computation-method/+merge/104945

[Alexis de Lattre (alexis-via)]

@Lorenzo

I am not (yet) familiar with YAML, so I can't review your proposal, sorry.

[Lorenzo Battistini (elbati)]

On 07/11/2012 10:55 PM, Alexis de Lattre wrote:
> @Lorenzo
>
> I am not (yet) familiar with YAML, so I can't review your proposal, sorry.

Hello Alexis, I just adapted my tests to your implementation and it
passed them.
So, well done :-)

I propose to merge them
<https://code.launchpad.net/%7Eelbati/openobject-addons/add-yaml-tests-for-tax-computation/+merge/114679>
into the account, sale and purchase modules.

Just one remark: as correctly pointed by Ferdinand
<https://lists.launchpad.net/openerp-expert-accounting/msg01728.html>,
there should be the possibility to set the 'Tax calculation rounding
method' at partner and document level. This is because a company could
receive some supplier invoices computed by 'Round per line' and some
others by 'Round globally'. So, user should be able to change the
behaviour according to the case.

Regards and thanks for your work.

--
Lorenzo Battistini
http://planet.domsense.com/en/author/elbati/

=== modified file 'account/account.py'
--- account/account.py	2012-06-26 20:09:09 +0000
+++ account/account.py	2012-07-07 21:01:19 +0000
@@ -2066,7 +2066,20 @@
                 '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
+        # summed, leading to the total amount for that tax. But, if the
+        # company has tax_calculation_rounding_method = round_globally,
+        # we still follow the same method, but we use a much larger
+        # precision when we round the tax amount for each line (we use
+        # the 'Account' decimal precision + 5), and that way it's like
+        # 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':
+            tax_compute_precision += 5
         totalin = totalex = round(price_unit * quantity, precision)
         tin = []
         tex = []
@@ -2075,7 +2088,7 @@
                 tex.append(tax)
             else:
                 tin.append(tax)
-        tin = self.compute_inv(cr, uid, tin, price_unit, quantity, product=product, partner=partner)
+        tin = self.compute_inv(cr, uid, tin, price_unit, quantity, product=product, partner=partner, precision=tax_compute_precision)
         for r in tin:
             totalex -= r.get('amount', 0.0)
         totlex_qty = 0.0
@@ -2083,7 +2096,7 @@
             totlex_qty = totalex/quantity
         except:
             pass
-        tex = self._compute(cr, uid, tex, totlex_qty, quantity,product=product, partner=partner)
+        tex = self._compute(cr, uid, tex, totlex_qty, quantity, product=product, partner=partner, precision=tax_compute_precision)
         for r in tex:
             totalin += r.get('amount', 0.0)
         return {
@@ -2096,7 +2109,7 @@
         _logger.warning("Deprecated, use compute_all(...)['taxes'] instead of compute(...) to manage prices with tax included")
         return self._compute(cr, uid, taxes, price_unit, quantity, product, partner)
 
-    def _compute(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None):
+    def _compute(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None, precision=None):
         """
         Compute tax values for given PRICE_UNIT, QUANTITY and a buyer/seller ADDRESS_ID.
 
@@ -2105,14 +2118,15 @@
             tax = {'name':'', 'amount':0.0, 'account_collected_id':1, 'account_paid_id':2}
             one tax for each tax id in IDS and their children
         """
+        if not precision:
+            precision = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
         res = self._unit_compute(cr, uid, taxes, price_unit, product, partner, quantity)
         total = 0.0
-        precision_pool = self.pool.get('decimal.precision')
         for r in res:
             if r.get('balance',False):
-                r['amount'] = round(r.get('balance', 0.0) * quantity, precision_pool.precision_get(cr, uid, 'Account')) - total
+                r['amount'] = round(r.get('balance', 0.0) * quantity, precision) - total
             else:
-                r['amount'] = round(r.get('amount', 0.0) * quantity, precision_pool.precision_get(cr, uid, 'Account'))
+                r['amount'] = round(r.get('amount', 0.0) * quantity, precision)
                 total += r['amount']
         return res
 
@@ -2188,7 +2202,7 @@
             r['todo'] = 0
         return res
 
-    def compute_inv(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None):
+    def compute_inv(self, cr, uid, taxes, price_unit, quantity, product=None, partner=None, precision=None):
         """
         Compute tax values for given PRICE_UNIT, QUANTITY and a buyer/seller ADDRESS_ID.
         Price Unit is a VAT included price
@@ -2198,15 +2212,15 @@
             tax = {'name':'', 'amount':0.0, 'account_collected_id':1, 'account_paid_id':2}
             one tax for each tax id in IDS and their children
         """
+        if not precision:
+            precision = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
         res = self._unit_compute_inv(cr, uid, taxes, price_unit, product, partner=None)
         total = 0.0
-        obj_precision = self.pool.get('decimal.precision')
         for r in res:
-            prec = obj_precision.precision_get(cr, uid, 'Account')
             if r.get('balance',False):
-                r['amount'] = round(r['balance'] * quantity, prec) - total
+                r['amount'] = round(r['balance'] * quantity, precision) - total
             else:
-                r['amount'] = round(r['amount'] * quantity, prec)
+                r['amount'] = round(r['amount'] * quantity, precision)
                 total += r['amount']
         return res
 

=== modified file 'account/company.py'
--- account/company.py	2012-05-10 11:38:26 +0000
+++ account/company.py	2012-07-07 21:01:19 +0000
@@ -25,6 +25,11 @@
     _inherit = "res.company"
     _columns = {
         'expects_chart_of_accounts': fields.boolean('Expects a Chart of Accounts'),
+        '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."),
         'paypal_account': fields.char("Paypal Account", size=128, help="Paypal username (usually email) for receiving online payments."),
         'overdue_msg': fields.text('Overdue Payments Message', translate=True),
         'property_reserve_and_surplus_account': fields.property(
@@ -39,6 +44,7 @@
 
     _defaults = {
         'expects_chart_of_accounts': True,
+        'tax_calculation_rounding_method': 'round_per_line',
         'overdue_msg': '''Dear Sir, dear Madam,
 
 Our records indicate that some payments on your account are still due. Please find details below.

=== modified file 'account/company_view.xml'
--- account/company_view.xml	2012-05-29 08:56:42 +0000
+++ account/company_view.xml	2012-07-07 21:01:19 +0000
@@ -24,6 +24,7 @@
             <field name="arch" type="xml">
                 <field name="currency_id" position="after">
                       <field name="property_reserve_and_surplus_account" colspan="2"/>
+                      <field name="tax_calculation_rounding_method" />
                       <field name="paypal_account"  placeholder="[e-mail]"/>
                 </field>
             </field>

=== modified file 'account/res_config.py'
--- account/res_config.py	2012-06-28 11:34:23 +0000
+++ account/res_config.py	2012-07-07 21:01:19 +0000
@@ -49,6 +49,12 @@
         'has_chart_of_accounts': fields.boolean('Company has a chart of accounts'),
         'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', domain="[('visible','=', True)]"),
         'code_digits': fields.integer('# of Digits', help="No. of Digits to use for account code"),
+        'tax_calculation_rounding_method': fields.related('company_id',
+            'tax_calculation_rounding_method', type='selection', selection=[
+            ('round_per_line', 'Round per line'),
+            ('round_globally', 'Round globally'),
+            ], string='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."),
         'sale_tax': fields.many2one("account.tax.template", "Default Sale Tax"),
         'purchase_tax': fields.many2one("account.tax.template", "Default Purchase Tax"),
         'sale_tax_rate': fields.float('Sales Tax (%)'),
@@ -152,6 +158,7 @@
             'has_chart_of_accounts': has_chart_of_accounts,
             'has_fiscal_year': bool(fiscalyear_count),
             'chart_template_id': False,
+            'tax_calculation_rounding_method': company.tax_calculation_rounding_method,
         }
         # update journals and sequences
         for journal_type in ('sale', 'sale_refund', 'purchase', 'purchase_refund'):

=== modified file 'account/res_config_view.xml'
--- account/res_config_view.xml	2012-07-06 14:54:10 +0000
+++ account/res_config_view.xml	2012-07-07 21:01:19 +0000
@@ -76,6 +76,7 @@
                         <group>
                             <field name="default_purchase_tax" domain="[('type_tax_use','=','purchase'), ('company_id','=',company_id)]"
                                 attrs="{'invisible': [('has_chart_of_accounts','=',False)]}"/>
+                            <field name="tax_calculation_rounding_method" />
                             <field name="module_account_asset"/>
                             <field name="module_account_budget"/>
                         </group>