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

https://launchpad.net/bugs/941817
OCA · Jul 2, 2014 · 38b14bc · 38b14bc
1 parent 8be383b
commit 38b14bc
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
@@ -1114,6 +1114,23 @@ def action_number(self, cr, uid, ids, context=None):
                         (ref, move_id))
         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, context=None):
         if context is None:
             context = {}

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
@@ -215,7 +215,7 @@
                                 <field name="amount_untaxed" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                                 <div>
                                     <label for="amount_tax"/>
-                                    <button name="button_reset_taxes" states="draft,proforma2"
+                                    <button name="button_reset_taxes" states="draft"
                                         string="(update)" class="oe_link oe_edit_only"
                                         type="object" help="Recompute taxes and total"/>
                                 </div>
@@ -372,7 +372,7 @@
                                 <field name="amount_untaxed" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                                 <div>
                                     <label for="amount_tax"/>
-                                    <button name="button_reset_taxes" states="draft,proforma2"
+                                    <button name="button_reset_taxes" states="draft"
                                         string="(update)" class="oe_link oe_edit_only"
                                         type="object" help="Recompute taxes and total"/>
                                 </div>

diff --git a/addons/account/account_invoice_workflow.xml b/addons/account/account_invoice_workflow.xml
@@ -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>