Merge lp:~therp-nl/ocb-addons/6.1-lp941817-autocompute_taxes_on_proforma into lp:ocb-addons/6.1

[Stefan Rijnhart (Opener)]

[FIX] lp:941817, taxes not computed automatically on proforma

In OpenERP 6.1 and 7.0, taxes are not computed automatically in the workflow when a draft invoice becomes a proforma. This can lead to invalid proformas without tax being sent out by the user. This branch triggers the tax calculation from the workflow. Additionally, this branch hides the tax computation button which does have a function anymore after the first change.

The suggested change in https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-941817-amp makes it impossible to fix rounding differences in the tax amounts. The change in this proposal calls the same method as the validation step in the same invoice workflow, which only checks the base amount of existing taxes.

[Ronald Portier (Therp) (rportier1962)]

I think this is an important improvement.

Just wondering: why should the 'Compute Taxes' button be needed at all? Shouldn't taxes be automatically be updated whenever an invoice line changes?

Of course with keeping the possibility to add extra taxes, or modify tax lines when there have been rounding errors (as still happens all to frequently).

[Stefan Rijnhart (Opener) (stefan-opener)]

Yes it is an important issue. However, the current fix makes it impossible to make changes in the tax amounts to fix rounding difference like you mention. Will refactor using account_invoice.check_tax_lines(). The scenario that you refer to would be useful but is out of scope for this particular issue.

[Alexandre Fayolle - camptocamp (alexandre-fayolle-c2c)]

LGTM

review: Approve (code review, no test)

[Holger Brunn (Therp) (hbrunn)]

review: Approve (code review, no test)

=== modified file 'account/account_invoice.py'
--- account/account_invoice.py	2013-04-09 13:45:44 +0000
+++ account/account_invoice.py	2013-04-17 20:08:27 +0000
@@ -1062,6 +1062,23 @@
                 self.log(cr, uid, inv_id, message, context=ctx)
         return True
 
+    def action_proforma(self, cr, uid, ids, context=None):
+        """
+        Check if all taxes are present with the correct base amount
+        on creating a proforma invoice. This leaves room for manual
+        corrections of the tax amount.
+        """
+        if not ids:
+            return True
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        ait_obj = self.pool.get('account.invoice.tax')
+        for inv in self.browse(cr, uid, ids, context=context):
+            compute_taxes = ait_obj.compute(cr, uid, inv.id, context=context)
+            self.check_tax_lines(cr, uid, inv, compute_taxes, ait_obj)
+        return self.write(
+            cr, uid, ids, {'state': 'proforma2'}, context=context)
+
     def action_cancel(self, cr, uid, ids, *args):
         context = {} # TODO: Use context from arguments
         account_move_obj = self.pool.get('account.move')

=== modified file 'account/account_invoice_view.xml'
--- account/account_invoice_view.xml	2013-01-23 09:13:47 +0000
+++ account/account_invoice_view.xml	2013-04-17 20:08:27 +0000
@@ -296,7 +296,7 @@
                             </group>
                             <group col="4" colspan="2">
                                 <group colspan="2" col="1">
-                                    <button name="button_reset_taxes" states="draft,proforma2" string="Compute Taxes" type="object" groups="base.group_user" icon="terp-stock_format-scientific" help="This action will erase taxes"/>
+                                    <button name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" groups="base.group_user" icon="terp-stock_format-scientific" help="This action will erase taxes"/>
                                 </group>
                                 <field name="amount_untaxed"/>
                                 <label string="" colspan="2"/>

=== modified file 'account/account_invoice_workflow.xml'
--- account/account_invoice_workflow.xml	2011-01-14 00:11:01 +0000
+++ account/account_invoice_workflow.xml	2013-04-17 20:08:27 +0000
@@ -17,7 +17,7 @@
         <record id="act_proforma2" model="workflow.activity">
             <field name="wkf_id" ref="wkf"/>
             <field name="name">proforma2</field>
-            <field name="action">write({'state':'proforma2'})</field>
+            <field name="action">action_proforma()</field>
             <field name="kind">function</field>
         </record>