From 5f4975106914ba8894eba3443284050f8ad907f3 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Tue, 26 Jun 2012 14:43:10 +0530
Subject: [PATCH] [IMP] improve customer invoice view.

bzr revid: nco@tinyerp.com-20120626091310-5srg6va55n52rvxg
---
 addons/account/account_invoice_view.xml       | 33 +++++++++++--------
 .../account_asset_invoice_view.xml            |  2 +-
 .../account_invoice_layout.py                 |  2 +-
 .../account_invoice_layout_view.xml           |  2 ++
 4 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 7ac6e6154ab..5eab7e62651 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -52,20 +52,25 @@
             <field name="arch" type="xml">
                 <form string="Invoice Line" version="7.0">
                     <group col="4">
-                        <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
-                        <field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/>
-                        <field name="name"/>
-                        <label string="Quantity" for="quantity" align="1.0"/>
-                        <div>
-                            <field name="quantity" class="oe_inline"/>
-                            <field name="uos_id" class="oe_inline"
-                              on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
-                        </div>
-                        <field name="company_id" groups="base.group_multi_company" readonly="1"/>
-                        <field name="price_unit"/>
-                        <field name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]" widget="many2many_tags"/>
-                        <field name="discount"/>
-                        <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
+                    	<group>
+	                        <field name="product_id" on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
+	                        <field name="name"/>
+	                        <label string="Quantity" for="quantity" align="1.0"/>
+	                        <div>
+	                            <field name="quantity" class="oe_inline"/>
+	                            <field name="uos_id" class="oe_inline"
+	                              on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.currency_id, context, parent.company_id)"/>
+	                        </div>
+	                        <field name="price_unit"/>
+	                        <field name="discount"/>
+                        </group>
+                        
+                        <group>
+                        	<field domain="[('company_id', '=', parent.company_id), ('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id" on_change="onchange_account_id(product_id, parent.partner_id, parent.type, parent.fiscal_position,account_id)"/>
+                        	<field name="company_id" groups="base.group_multi_company" readonly="1"/>
+                        	<field name="invoice_line_tax_id" context="{'type':parent.type}" domain="[('parent_id','=',False),('company_id', '=', parent.company_id)]" widget="many2many_tags"/>
+                        	<field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
+                        </group>
                     </group>
                     <separator string="Notes"/>
                     <field name="note"/>
diff --git a/addons/account_asset/account_asset_invoice_view.xml b/addons/account_asset/account_asset_invoice_view.xml
index 4af0c6568fe..fe1435d4745 100644
--- a/addons/account_asset/account_asset_invoice_view.xml
+++ b/addons/account_asset/account_asset_invoice_view.xml
@@ -12,7 +12,7 @@
         <field name="inherit_id" ref="account.view_invoice_line_form"/>
         <field name="type">form</field>
         <field name="arch" type="xml">
-            <field name="name" position="after">
+            <field name="account_id" position="after">
                 <field name="asset_category_id"/>
             </field>
         </field>
diff --git a/addons/account_invoice_layout/account_invoice_layout.py b/addons/account_invoice_layout/account_invoice_layout.py
index 68ae537f20e..1336914fb35 100644
--- a/addons/account_invoice_layout/account_invoice_layout.py
+++ b/addons/account_invoice_layout/account_invoice_layout.py
@@ -160,7 +160,7 @@ class account_invoice_line(osv.osv):
                 ('line','Separator Line'),
                 ('break','Page Break'),]
             ,'Type', select=True, required=True),
-        'sequence': fields.integer('Sequence Number', select=True, help="Gives the sequence order when displaying a list of invoice lines."),
+        'sequence': fields.integer('Sequence', select=True, help="Gives the sequence order when displaying a list of invoice lines."),
         'functional_field': fields.function(_fnct, arg=None, fnct_inv=None, fnct_inv_arg=None, type='char', fnct_search=None, obj=None, store=False, string="Source Account"),
     }
 
diff --git a/addons/account_invoice_layout/account_invoice_layout_view.xml b/addons/account_invoice_layout/account_invoice_layout_view.xml
index 7cf4c0a821a..faaed1dfd79 100644
--- a/addons/account_invoice_layout/account_invoice_layout_view.xml
+++ b/addons/account_invoice_layout/account_invoice_layout_view.xml
@@ -11,6 +11,8 @@
             <field name="arch" type="xml">
                 <field name="product_id" position="before">
                     <field name="state" on_change="onchange_invoice_line_view(state)" />
+                </field>
+                <field name="account_id" position="before">
                     <field name="sequence"/>
                 </field>
             </field>