From 57ee27b86c30e4e81d1a692258c5e23eca5ecff4 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Mon, 11 Jun 2012 16:42:23 +0200
Subject: [PATCH] fix

bzr revid: fp@tinyerp.com-20120611144223-9ha9jwaabmeawgb5
---
 addons/account/account_invoice_view.xml | 12 +++++++-----
 addons/sale/sale_view.xml               |  1 -
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 6b48f164a35..827faa01d0a 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -287,8 +287,10 @@
                 </header>
                 <sheet string="Invoice">
                     <h1>
-                        <field name="state" class="oe_form_inline"/>
-                        <field name="number"/>
+                        <label string="Draft Invoice " attrs="{'invisible': [('state','not in',('draft',))]}"/>
+                        <label string="Pro Forma Invoice " attrs="{'invisible': [('state','not in',('proforma','proforma2'))]}"/>
+                        <label string="Invoice " attrs="{'invisible': [('state','in',('draft','proforma','proforma2'))]}"/>
+                        <field name="number" readonly="1"/>
                     </h1>
                     <label string="Concerns" for="name" class="oe_form_readonly_hidden"/>
                     <h2>
@@ -333,8 +335,8 @@
                         <page string="Invoice">
                             <field colspan="4" name="invoice_line" nolabel="1" widget="one2many_list" context="{'type': type}"/>
                             <group>
-                                <group>
-                                    <field name="tax_line">
+                                <div>
+                                    <field name="tax_line" nolabel="1">
                                         <tree editable="bottom" string="Taxes">
                                             <field name="name"/>
                                             <field name="account_id" groups="account.group_account_invoice"/>
@@ -349,7 +351,7 @@
                                     <button name="button_reset_taxes" states="draft,proforma2" string="Compute Taxes"
                                         type="object" groups="account.group_account_user" icon="terp-stock_format-scientific"
                                         help="This action will erase taxes"/>
-                                </group>
+                                </div>
                                 <group class="oe_form_subtotal_footer">
                                     <field name="amount_untaxed"/>
                                     <field name="amount_tax"/>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 094b0cae9ef..b439c7ff4f0 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -132,7 +132,6 @@
                         <label string="Sale Order " attrs="{'invisible': [('state','in',('draft','sent'))]}"/>
                         <field name="name" class="oe_form_inline" readonly="1"/>
                     </h1>
-
                     <group>
                         <group>
                             <field name="partner_id" on_change="onchange_partner_id(partner_id)" domain="[('customer','=',True)]" context="{'search_default_customer':1}" />