Merge lp:~openerp-dev/openobject-addons/trunk-bug-941817-amp into lp:openobject-addons

[Amit Parik]

Hello,

Pro-forma invoice should be calculated the taxes because If user forget to "Compute Taxes" then It will creates a problem.

This fix will solved the problem please see lp:941817 's comment#7.

Thank you!

[Amit Parik (amit-parik)]

This thing is already improved on trunk, Please see "Recompute taxes and total" button on account_invoice_view.xml.

So I request to core team please reject my this MP.

Thanks!

review: Abstain

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

For the record, lp:941817 is not solved in 7.0. This branch fixes the problem correctly at least in 6.1.

review: Approve

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

On second thoughts, the fix in this proposal does not allow the user to change the tax amount to fix a rounding difference for instance, which is allowed if the user creates an invoice directly. I implemented a fix that follows the same procedure as is the case when the invoice is validated: https://code.launchpad.net/~therp-nl/openobject-addons/7.0-lp941817-autocompute_taxes_on_proforma/+merge/159701

review: Disapprove

Unmerged revisions

6732. By Amit Parik on 2012-04-16

[FIX] Account : Pro-forma invoice button calculated the taxes

=== modified file 'account/account_invoice_view.xml'
--- account/account_invoice_view.xml	2012-04-05 16:55:29 +0000
+++ account/account_invoice_view.xml	2012-04-16 12:34:26 +0000
@@ -290,7 +290,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	2012-03-19 10:38:23 +0000
+++ account/account_invoice_workflow.xml	2012-04-16 12:34:26 +0000
@@ -17,7 +17,8 @@
         <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">write({'state':'proforma2'})
+				button_reset_taxes()</field>
             <field name="kind">function</field>
         </record>