Merge lp:~openobject-italia-core-devs/openobject-italia/l10n_it_invoice_tax_compute into lp:~openobject-italia-core-devs/openobject-italia/italian-addons

[Lorenzo Battistini]

[Lorenzo Battistini (elbati)]

Non appena qualcuno conferma che il modulo 'l10n_it_invoice_tax' effettua correttamente il calcolo delle tasse sulle righe della fattura, possiamo approvare il merge sul repository ufficiale

[Lorenzo Battistini (elbati)]

Sembrano esserci problemi con le tasse parzialmente deducibili.
Ho provato a creare una fattura fornitore con una riga da 123,57 e IVA 20% deducibile al 50%.

Cliccando su 'Compute Taxes' ottengo

ERROR:web-services:Uncaught exception
Traceback (most recent call last):
  File "/home/elbati/workspace/openerp/openerp6/server/bin/osv/osv.py", line 122, in wrapper
    return f(self, dbname, *args, **kwargs)
  File "/home/elbati/workspace/openerp/openerp6/server/bin/osv/osv.py", line 176, in execute
    res = self.execute_cr(cr, uid, obj, method, *args, **kw)
  File "/home/elbati/workspace/openerp/openerp6/server/bin/osv/osv.py", line 167, in execute_cr
    return getattr(object, method)(cr, uid, *args, **kw)
  File "/home/elbati/workspace/openerp/openerp6/server/bin/addons/account/invoice.py", line 644, in button_reset_taxes
    for taxe in ait_obj.compute(cr, uid, id, context=ctx).values():
  File "/home/elbati/workspace/openerp/openerp6/server/bin/addons/l10n_it_invoice_tax/invoice.py", line 79, in compute
    amount = tax_obj.compute_all(cr, uid, t['tax'], t['price'], 1)["taxes"][0]["amount"] #MG
KeyError: 'tax'

review: Needs Fixing

[Lorenzo Battistini (elbati)]

Per me ora il modulo 'account_invoice_tax_by_column' funziona

review: Approve

[Lorenzo Battistini (elbati)]

Si potrebbe perfezionare il modulo cercando di usare 'super' ove possibile invece di riscrivere completamente i metodi di calcolo delle tasse

[Lorenzo Battistini (elbati)]

Ecco: http://bazaar.launchpad.net/~openobject-italia-core-devs/openobject-italia/l10n_it_invoice_tax_compute/revision/105
Qualcuno vuole fare dei test?

review: Approve

[Sergio Corato (icsergio)]

Il 20/08/2011 12:10, Lorenzo Battistini - Agile BG - Domsense ha scritto:
> Review: Approve
> Ecco: http://bazaar.launchpad.net/~openobject-italia-core-devs/openobject-italia/l10n_it_invoice_tax_compute/revision/105
> Qualcuno vuole fare dei test?
L'ho provato sulla 6.0.3, per me è tutto regolare.

[Davide Corio (enlightx-deactivatedaccount)]

Allora, lato tecnico (codice, funzionamento wizard, stampe...) mi pare tutto ok, quindi il merge è ok per me.
Possiamo quindi iniziare a lavorare alle raffinatezze e all'usabilità. soprattutto per quanto riguarda wizard e stampe.

Cmq bravo Lorenzo

[Davide Corio (enlightx-deactivatedaccount)]

Ooooops, ho fatto casino :-)

per qualche link confuso stavo testando il branch sui registri iva.

su questo branch invece ho trovato un errore di calcolo con aliquote parzialmente deducibili

=== added directory 'account_invoice_tax_by_column'
=== added file 'account_invoice_tax_by_column/AUTHORS.txt'
--- account_invoice_tax_by_column/AUTHORS.txt	1970-01-01 00:00:00 +0000
+++ account_invoice_tax_by_column/AUTHORS.txt	2011-08-20 10:12:24 +0000
@@ -0,0 +1,4 @@
+Matteo Grolla <[e-mail]>
+Marco Marchiori <[e-mail]>
+Massimo Biancalani <[e-mail]>
+Lorenzo Battistini <[e-mail]>

=== added file 'account_invoice_tax_by_column/__init__.py'
--- account_invoice_tax_by_column/__init__.py	1970-01-01 00:00:00 +0000
+++ account_invoice_tax_by_column/__init__.py	2011-08-20 10:12:24 +0000
@@ -0,0 +1,24 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011
+#    Associazione OpenERP Italia (<http://www.openerp-italia.org>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import invoice
+import account

=== added file 'account_invoice_tax_by_column/__openerp__.py'
--- account_invoice_tax_by_column/__openerp__.py	1970-01-01 00:00:00 +0000
+++ account_invoice_tax_by_column/__openerp__.py	2011-08-20 10:12:24 +0000
@@ -0,0 +1,58 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011
+#    Associazione OpenERP Italia (<http://www.openerp-italia.org>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+{
+    'name': 'Account Invoice Tax - Computation By Column',
+    'version': '0.1',
+    'category': 'Generic Modules/Accounting',
+    'description': """    
+    -Invoice taxes: 
+        legend:
+            TA(l)    TaxAmount for line l
+            TBA(l)   TaxBaseAmount for line l
+            TA(t)    TaxAmount for tax t
+            TBA(t)   TaxBaseAmount for tax t
+            
+        default behaviour: 
+            openerp by default calculates taxes line by line as a function of line tax base amount 
+            and then groups these amounts by tax.
+            TA(l) = f(TBA(l)
+            TA(t) = sum( round( TA(l) ) )    /sum on lines l to which tax t is applied
+        this module behaviour: 
+            In Italy the correct way to compute taxes is to first compute the tax base amount TBA(t) 
+            and the compute TA as a function of TBA(t)
+            TBA(t) = sum( TBA(t) )    /sum on lines l to which tax t is applied
+            TA(t) = f( TBA(t) )
+        the result difference is small but important
+
+    """,
+    'author': 'OpenERP Italian Community',
+    'website': 'http://www.openerp-italia.org',
+    'license': 'AGPL-3',
+    "depends" : ['account', 'account_voucher'],
+    "init_xml" : [],
+    "update_xml" : [],
+    "demo_xml" : [],
+    "active": False,
+    "installable": True
+}
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+

=== added file 'account_invoice_tax_by_column/account.py'
--- account_invoice_tax_by_column/account.py	1970-01-01 00:00:00 +0000
+++ account_invoice_tax_by_column/account.py	2011-08-20 10:12:24 +0000
@@ -0,0 +1,55 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2010-2010 Camptocamp Austria (<http://www.camptocamp.at>)
+#    Copyright (C) 2011
+#    Associazione OpenERP Italia (<http://www.openerp-italia.org>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+import decimal_precision as dp
+from decimal import *
+
+class account_tax(osv.osv):
+
+    _inherit = 'account.tax'
+    
+    _columns = {
+        'line_precision' : fields.boolean('Rounding Precision', help="Calculates floating point tax per line to simulate vertical calculation"),
+    }
+    
+    _defaults = {
+        'line_precision': True
+    }
+
+    def _compute(self, cr, uid, taxes, price_unit, quantity, address_id=None, product=None, partner=None):
+        res = super(account_tax, self)._compute(cr, uid, taxes, price_unit, quantity, address_id, product, partner)
+        tax_pool=self.pool.get('account.tax')
+        total = 0.0
+        for r in res:
+            tax = tax_pool.browse(cr, uid, r['id'])
+            if tax.line_precision:
+                if r.get('balance',False):
+                    r['amount'] = r.get('balance', 0.0) * quantity - total
+                else:
+                    r['amount'] = r.get('amount', 0.0) * quantity
+                    total += r['amount']
+        return res
+
+
+account_tax()

=== added directory 'account_invoice_tax_by_column/i18n'
=== added file 'account_invoice_tax_by_column/i18n/account_invoice_tax_by_column.pot'
--- account_invoice_tax_by_column/i18n/account_invoice_tax_by_column.pot	1970-01-01 00:00:00 +0000
+++ account_invoice_tax_by_column/i18n/account_invoice_tax_by_column.pot	2011-08-20 10:12:24 +0000
@@ -0,0 +1,72 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_invoice_tax_by_column
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.2\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2011-07-23 14:32+0000\n"
+"PO-Revision-Date: 2011-07-23 14:32+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: account_invoice_tax_by_column
+#: model:ir.model,name:account_invoice_tax_by_column.model_account_invoice_tax
+msgid "Invoice Tax"
+msgstr ""
+
+#. module: account_invoice_tax_by_column
+#: model:ir.module.module,description:account_invoice_tax_by_column.module_meta_information
+msgid "    \n"
+"    -Invoice taxes: \n"
+"        legend:\n"
+"            TA(l)    TaxAmount for line l\n"
+"            TBA(l)   TaxBaseAmount for line l\n"
+"            TA(t)    TaxAmount for tax t\n"
+"            TBA(t)   TaxBaseAmount for tax t\n"
+"            \n"
+"        default behaviour: \n"
+"            openerp by default calculates taxes line by line as a function of line tax base amount \n"
+"            and then groups these amounts by tax.\n"
+"            TA(l) = f(TBA(l)\n"
+"            TA(t) = sum( round( TA(l) ) )    /sum on lines l to which tax t is applied\n"
+"        this module behaviour: \n"
+"            In Italy the correct way to compute taxes is to first compute the tax base amount TBA(t) \n"
+"            and the compute TA as a function of TBA(t)\n"
+"            TBA(t) = sum( TBA(t) )    /sum on lines l to which tax t is applied\n"
+"            TA(t) = f( TBA(t) )\n"
+"        the result difference is small but important\n"
+"\n"
+"    "
+msgstr ""
+
+#. module: account_invoice_tax_by_column
+#: help:account.tax,line_precision:0
+msgid "Calculates floating point tax per line to simulate vertical calculation"
+msgstr ""
+
+#. module: account_invoice_tax_by_column
+#: field:account.tax,line_precision:0
+msgid "Rounding Precision"
+msgstr ""
+
+#. module: account_invoice_tax_by_column
+#: model:ir.module.module,shortdesc:account_invoice_tax_by_column.module_meta_information
+msgid "Account Invoice Tax - Computation By Column"
+msgstr ""
+
+#. module: account_invoice_tax_by_column
+#: model:ir.model,name:account_invoice_tax_by_column.model_account_tax
+msgid "account.tax"
+msgstr ""
+
+#. module: account_invoice_tax_by_column
+#: sql_constraint:account.tax:0
+msgid "The tax name must be unique!"
+msgstr ""
+

=== added file 'account_invoice_tax_by_column/i18n/it.po'
--- account_invoice_tax_by_column/i18n/it.po	1970-01-01 00:00:00 +0000
+++ account_invoice_tax_by_column/i18n/it.po	2011-08-20 10:12:24 +0000
@@ -0,0 +1,94 @@
+# Translation of OpenERP Server.
+# This file contains the translation of the following modules:
+#	* account_invoice_tax_by_column
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: OpenERP Server 6.0.2\n"
+"Report-Msgid-Bugs-To: [e-mail]\n"
+"POT-Creation-Date: 2011-07-23 14:32+0000\n"
+"PO-Revision-Date: 2011-07-23 16:35+0100\n"
+"Last-Translator: Lorenzo Battistini <[e-mail]>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+
+#. module: account_invoice_tax_by_column
+#: model:ir.model,name:account_invoice_tax_by_column.model_account_invoice_tax
+msgid "Invoice Tax"
+msgstr "Imposta della fattura"
+
+#. module: account_invoice_tax_by_column
+#: model:ir.module.module,description:account_invoice_tax_by_column.module_meta_information
+msgid ""
+"    \n"
+"    -Invoice taxes: \n"
+"        legend:\n"
+"            TA(l)    TaxAmount for line l\n"
+"            TBA(l)   TaxBaseAmount for line l\n"
+"            TA(t)    TaxAmount for tax t\n"
+"            TBA(t)   TaxBaseAmount for tax t\n"
+"            \n"
+"        default behaviour: \n"
+"            openerp by default calculates taxes line by line as a function of line tax base amount \n"
+"            and then groups these amounts by tax.\n"
+"            TA(l) = f(TBA(l)\n"
+"            TA(t) = sum( round( TA(l) ) )    /sum on lines l to which tax t is applied\n"
+"        this module behaviour: \n"
+"            In Italy the correct way to compute taxes is to first compute the tax base amount TBA(t) \n"
+"            and the compute TA as a function of TBA(t)\n"
+"            TBA(t) = sum( TBA(t) )    /sum on lines l to which tax t is applied\n"
+"            TA(t) = f( TBA(t) )\n"
+"        the result difference is small but important\n"
+"\n"
+"    "
+msgstr ""
+"    \n"
+"    -Invoice taxes: \n"
+"        legend:\n"
+"            TA(l)    TaxAmount for line l\n"
+"            TBA(l)   TaxBaseAmount for line l\n"
+"            TA(t)    TaxAmount for tax t\n"
+"            TBA(t)   TaxBaseAmount for tax t\n"
+"            \n"
+"        default behaviour: \n"
+"            openerp by default calculates taxes line by line as a function of line tax base amount \n"
+"            and then groups these amounts by tax.\n"
+"            TA(l) = f(TBA(l)\n"
+"            TA(t) = sum( round( TA(l) ) )    /sum on lines l to which tax t is applied\n"
+"        this module behaviour: \n"
+"            In Italy the correct way to compute taxes is to first compute the tax base amount TBA(t) \n"
+"            and the compute TA as a function of TBA(t)\n"
+"            TBA(t) = sum( TBA(t) )    /sum on lines l to which tax t is applied\n"
+"            TA(t) = f( TBA(t) )\n"
+"        the result difference is small but important\n"
+"\n"
+"    "
+
+#. module: account_invoice_tax_by_column
+#: help:account.tax,line_precision:0
+msgid "Calculates floating point tax per line to simulate vertical calculation"
+msgstr "Calculates floating point tax per line to simulate vertical calculation"
+
+#. module: account_invoice_tax_by_column
+#: field:account.tax,line_precision:0
+msgid "Rounding Precision"
+msgstr "Precisione arrotondamento"
+
+#. module: account_invoice_tax_by_column
+#: model:ir.module.module,shortdesc:account_invoice_tax_by_column.module_meta_information
+msgid "Account Invoice Tax - Computation By Column"
+msgstr "Imposte fattura - Calcolo per colonna"
+
+#. module: account_invoice_tax_by_column
+#: model:ir.model,name:account_invoice_tax_by_column.model_account_tax
+msgid "account.tax"
+msgstr "account.tax"
+
+#. module: account_invoice_tax_by_column
+#: sql_constraint:account.tax:0
+msgid "The tax name must be unique!"
+msgstr "Il nome della tasse deve essere unico"
+

=== added file 'account_invoice_tax_by_column/invoice.py'
--- account_invoice_tax_by_column/invoice.py	1970-01-01 00:00:00 +0000
+++ account_invoice_tax_by_column/invoice.py	2011-08-20 10:12:24 +0000
@@ -0,0 +1,79 @@
+# -*- encoding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2011
+#    Associazione OpenERP Italia (<http://www.openerp-italia.org>)
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+import time
+from osv import fields, osv
+
+
+class account_invoice_tax(osv.osv):
+    _inherit = "account.invoice.tax"
+
+    def compute(self, cr, uid, invoice_id, context=None):
+        tax_grouped = super(account_invoice_tax, self).compute(cr, uid, invoice_id, context)
+        total_base = 0
+        total_tax = {}
+        total_amount_of_taxes_horizontal = 0
+        number_deductible_account = 0
+        cur_obj = self.pool.get('res.currency')
+        inv = self.pool.get('account.invoice').browse(cr, uid, invoice_id, context=context)
+        cur = inv.currency_id
+        for line in inv.invoice_line:
+            # workout of total amount of taxes
+            for tax in line.invoice_line_tax_id:
+                key = tax['amount']
+                if not key in total_tax:
+                    # Total_tax 
+                    total_tax[key] = [0]
+                total_tax[key][0] += (line.price_unit* (1-(line.discount or 0.0)/100.0)) * tax['amount']
+
+        index = 0
+        for t in tax_grouped.values():
+            if inv.type in ('in_invoice') and t['base_code_id'] == False:
+                number_deductible_account += 1 
+            total_amount_of_taxes_horizontal += t['tax_amount']
+
+        total_amount_of_taxes_vertical = 0
+        # round the total amount of taxes
+        for t in total_tax.values():
+            t[0] = cur_obj.round(cr, uid, cur, t[0])
+            total_amount_of_taxes_vertical += t[0]
+        total_amount_of_taxes_vertical = cur_obj.round(cr, uid, cur, total_amount_of_taxes_vertical)
+        total_amount_of_taxes_horizontal = cur_obj.round(cr, uid, cur, total_amount_of_taxes_horizontal)
+        if number_deductible_account != 0:
+            quotient = (total_amount_of_taxes_vertical - total_amount_of_taxes_horizontal) / number_deductible_account
+            quotient = cur_obj.round(cr, uid, cur, quotient)
+            remainder = (total_amount_of_taxes_vertical - total_amount_of_taxes_horizontal) - number_deductible_account * quotient
+            remainder = cur_obj.round(cr, uid, cur, remainder)
+        # change at least a deductible tax amount to to make coincide total amount of taxes
+        counter = 0
+        if inv.type in ('in_invoice') and total_amount_of_taxes_vertical != total_amount_of_taxes_horizontal:
+            for t in tax_grouped.values():               
+                if t['base_code_id'] == False:
+                    counter += 1
+                    t['tax_amount'] =  t['tax_amount'] + quotient
+                    t['amount'] =  t['amount'] + quotient
+                    if counter == number_deductible_account:
+                        t['tax_amount'] =  t['tax_amount'] + remainder
+                        t['amount'] =  t['amount'] + remainder  
+        return tax_grouped
+    
+account_invoice_tax()    
+

=== added directory 'account_invoice_tax_by_column/tests'
=== added file 'account_invoice_tax_by_column/tests/tests.txt'
--- account_invoice_tax_by_column/tests/tests.txt	1970-01-01 00:00:00 +0000
+++ account_invoice_tax_by_column/tests/tests.txt	2011-08-20 10:12:24 +0000
@@ -0,0 +1,107 @@
+Manual tests on tax calculation (should write automated tests)
+
+1) arrotondamento IVA ordinaria 20%
+fattura   VENDJ/2011/016  
+IVA20   12,29   2,46
+IVA20   12,29   2,46
+IVA20   12,29   2,46
+IVA10   
+  
+IVA10   
+  
+IVA10   
+  
+IVA10   
+  
+IVA10   
+  
+IVA10   
+  
+IVA10   
+  
+IVA10   
+  
+IVA10   
+  
+somma   36,87   7,38
+
+  
+  
+IVA10   0   0
+IVA20   36,87   7,37
+
+  
+  
+
+  36,87   7,37
+L'IVA corretta è 7,37, e cioè il 20% del totale imponibile al 20%
+
+2) arrotondamento IVA ordinaria e agevolata 4%
+fattura   VENDJ/2011/018  
+IVA4  12,33   0,49
+IVA20   12,29   2,46
+IVA20   12,29   2,46
+IVA20   12,29   2,46
+IVA4  12,33   0,49
+IVA4  12,33   0,49
+IVA20   12,29   2,46
+IVA20   12,29   2,46
+IVA20   12,29   2,46
+IVA20   
+  
+IVA20   
+  
+IVA20   
+  
+
+  
+  
+somma   110,73  16,23
+
+  
+  
+IVA4  36,99   1,48
+IVA20   73,74   14,75
+
+  
+  
+TOTALE IVA  110,73  16,23
+
+l'IVA viene correttamente ripartita fra IVA 4 ed IVA 20
+
+arrotondamento IVA ordinaria 20% ed agevolata 10%
+
+fattura   VENDJ/2011/019  
+IVA20   12,29   2,46
+IVA20   12,29   2,46
+IVA20   12,29   2,46
+IVA10   10,56   1,06
+IVA10   10,56   1,06
+IVA10   10,56   1,06
+IVA10   
+  
+IVA10   
+  
+IVA10   
+  
+IVA10   
+  
+IVA10   
+  
+IVA10   
+  
+
+  
+  
+somma   68,55   10,56
+
+  
+  
+IVA10   31,68   3,17
+IVA20   36,87   7,37
+
+  
+  
+TOTALE IVA  68,55   10,54
+
+L'IVA viene correttamente calcolata ed indicata secondo le aliquote