Merge lp:~openerp-dev/openobject-addons/6.1-opw-577465-msh into lp:openobject-addons/6.1

[Mohammed Shekha(Open ERP)]

Hello,

Fixed the issue of field amount_tax not shown at proper place when the compute tax is invisible in some state.

(The issue is faced in web-client and This is usability issue.)

There is col=4 and colspan=2 so and button has colspan=2, so when button is hidden so whole td is hidden and so amount_tax will get extra colspan and due to which field will positioned wrongly.

Thanks.

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Not Relevant on Trunk (means that architecture on trunk has changed and so this bug has no meaning anymore). If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

6926. By Mohammed Shekha(Open ERP) on 2012-07-31

[FIX]Fixed the issue of field amount tax not shown at proper place when compute tax button is hidden(in state other than draft).

=== modified file 'account/account_invoice_view.xml'
--- account/account_invoice_view.xml	2012-02-16 18:50:48 +0000
+++ account/account_invoice_view.xml	2012-07-31 12:13:25 +0000
@@ -198,7 +198,9 @@
                                 </field>
                             </group>
                             <group col="4" colspan="2">
-                                <button colspan="2" name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" icon="terp-stock_format-scientific" help="This action will erase taxes"/>
+                                <group colspan="2" col="1">
+                                    <button name="button_reset_taxes" states="draft" string="Compute Taxes" type="object" icon="terp-stock_format-scientific" help="This action will erase taxes"/>
+                                </group>
                                 <field name="amount_untaxed"/>
                                 <label string="" colspan="2"/>
                                 <field name="amount_tax"/>