From 1fbe1ed2ccc3d281c695e9d3baede593eb58cf7d Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Thu, 21 Jun 2012 15:11:10 +0530
Subject: [PATCH 1/5] [IMP]Based On Draft Invoice : change form view

bzr revid: hsa@tinyerp.com-20120621094110-w0imsro09w5te5jv
---
 addons/account/account_invoice_view.xml | 26 ++++++++-----------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 58a1abac364..f51fa343809 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -146,7 +146,7 @@
             <field name="type">form</field>
             <field name="priority">2</field>
             <field name="arch" type="xml">
-                <form version="7.0">
+               <form string="Draft Invoice" version="7.0">
                 <header>
                     <button name="invoice_open" states="draft,proforma2" string="Validate"/>
                     <button name="%(action_account_invoice_refund)d" type='action' string='Ask Refund' states='open,paid'/>
@@ -156,34 +156,24 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                 </header>
                 <sheet string="Supplier Invoice">
-                    <group>
+                    <group col="4" colspan="4">
                         <group>
-                            <field string="Supplier" name="partner_id"
-                              on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)"
-                              context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"
-                              domain="[('supplier', '=', True)]"/>
-                            <field name="fiscal_position" widget="selection"/>
-                        </group>
-                        <group>
-                            <field name="number"/>
                             <field name="date_invoice"/>
+                            <field name="date_due"/>
                             <field name="period_id" domain="[('state', '=', 'draft')]"
                                 groups="account.group_account_user" widget="selection"/>
-                            <field name="journal_id" on_change="onchange_journal_id(journal_id)" widget="selection"
-                                groups="account.group_account_user"/>
-                            <field domain="[('company_id', '=', company_id), ('type', '=', 'payable')]"
-                                name="account_id" groups="account.group_account_user"/>
-                            <field name="currency_id"/>
-                            <field name="type" invisible="1"/>
                         </group>
                         <group>
+                            <field name="fiscal_position" widget="selection"/>
+                            <field name="currency_id"/>
+                        </group>
+                    </group>
+                    <group>
                             <label for="reference"/>
                             <div>
                                 <field name="reference_type"/>
                                 <field name="reference" placeholder="Payment Reference"/>
                             </div>
-                            <field name="date_due"/>
-                        </group>
                     </group>
                     <notebook>
                         <page string="Invoice">

From a920a0cbd9ed3721055432009e0424fd1049d4cb Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Thu, 21 Jun 2012 15:24:02 +0530
Subject: [PATCH 2/5] [IMP]Based On Draft Invoice : change o2m in tree view

bzr revid: hsa@tinyerp.com-20120621095402-n2snwud0xy27o1jh
---
 addons/account/account_invoice_view.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index f51fa343809..8850789c89a 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -180,7 +180,6 @@
                             <field context="{'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False, 'type': type}" name="invoice_line">
                                 <tree string="Invoice lines">
                                     <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="invoice_line_tax_id" view_mode="2" context="{'type':parent.type}" domain="[('parent_id','=',False)]"/>
                                     <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                                     <field name="quantity"/>

From f278880a55591dd0b6992623ae99770f6151110d Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Thu, 21 Jun 2012 15:43:12 +0530
Subject: [PATCH 3/5] [IMP]Based On Draft Invoice : change o2m tree view in
 other info and payement tab

bzr revid: hsa@tinyerp.com-20120621101312-qe1ocn494cz32xnz
---
 addons/account/account_invoice_view.xml | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 8850789c89a..ce9dfa0e89e 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -222,26 +222,20 @@
                         <page string="Other Info">
                             <group col="4">
                                 <field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
-                                <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
+                                <field name="user_id"/>
                                 <newline/>
                                 <field name="payment_term" widget="selection"/>
-                                <field name="name"/>
                                 <newline/>
-                                <field name="origin" placeholder="PO0025"/>
-                                <field name="user_id"/>
-                                <field name="move_id" groups="account.group_account_user"/>
+                                <field name="name"/>
+                                <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
                             </group>
                         </page>
                         <page string="Payments">
                             <field name="payment_ids">
                                 <tree string="Payments">
                                     <field name="date" string="Payment Date"/>
-                                    <field name="move_id"/>
                                     <field name="ref"/>
                                     <field name="name"/>
-                                    <field name="journal_id"/>
-                                    <field name="debit"/>
-                                    <field name="credit"/>
                                     <field name="amount_currency"/>
                                     <field name="currency_id"/>
                                 </tree>

From d2033d21b5e746cbeeec8e9ecadb5217555f19bd Mon Sep 17 00:00:00 2001
From: Hardik <hsa@tinyerp.com>
Date: Thu, 21 Jun 2012 17:06:38 +0530
Subject: [PATCH 4/5] [IMP]Purchase Invoice Control Based on Purchase Order
 Line Comma is remove

bzr revid: hsa@tinyerp.com-20120621113638-ceunkw3zl7144pe2
---
 addons/account/account_invoice_view.xml | 13 ++++++++++---
 addons/purchase/purchase_view.xml       |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index ce9dfa0e89e..d29f58c3073 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -156,7 +156,11 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                 </header>
                 <sheet string="Supplier Invoice">
-                    <group col="4" colspan="4">
+                    <group>
+                        <field string="Supplier" name="partner_id"
+                              on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)"
+                              context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"
+                              domain="[('supplier', '=', True)]" invisible="1"/>
                         <group>
                             <field name="date_invoice"/>
                             <field name="date_due"/>
@@ -180,6 +184,7 @@
                             <field context="{'partner_id': partner_id, 'price_type': 'price_type' in dir() and price_type or False, 'type': type}" name="invoice_line">
                                 <tree string="Invoice lines">
                                     <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="invoice_line_tax_id" view_mode="2" context="{'type':parent.type}" domain="[('parent_id','=',False)]"/>
                                     <field domain="[('type','&lt;&gt;','view'), ('company_id', '=', parent.company_id), ('parent_id', '!=', False)]" name="account_analytic_id" groups="analytic.group_analytic_accounting"/>
                                     <field name="quantity"/>
@@ -225,8 +230,6 @@
                                 <field name="user_id"/>
                                 <newline/>
                                 <field name="payment_term" widget="selection"/>
-                                <newline/>
-                                <field name="name"/>
                                 <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
                             </group>
                         </page>
@@ -238,6 +241,10 @@
                                     <field name="name"/>
                                     <field name="amount_currency"/>
                                     <field name="currency_id"/>
+                                    <field name="move_id" invisible="1"/>
+                                    <field name="journal_id" invisible="1"/>
+                                    <field name="debit" invisible="1"/>
+                                    <field name="credit" invisible="1"/>
                                 </tree>
                             </field>
                         </page>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index e5ad3a19ce0..fd0cb9327ac 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -395,7 +395,7 @@
                     <sheet>
                         <label for="order_id" class="oe_edit_only"/>
                         <h1>
-                            <field name="order_id" class="oe_inline"/>, 
+                            <field name="order_id" class="oe_inline"/> 
                             <field name="date_order" class="oe_inline"/>
                         </h1>
                         <label for="partner_id" class="oe_edit_only"/>

From 2fb6faaf6c334bfc6bd453e85569d6f94da87c75 Mon Sep 17 00:00:00 2001
From: "DBR (OpenERP)" <dbr@tinyerp.com>
Date: Thu, 21 Jun 2012 18:13:28 +0530
Subject: [PATCH 5/5] [IMP]account: Improve header for form view

bzr revid: dbr@tinyerp.com-20120621124328-2fwjk7ap1cqvp8dg
---
 addons/account/account_invoice_view.xml | 26 +++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index d29f58c3073..835189726dd 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -156,28 +156,36 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                 </header>
                 <sheet string="Supplier Invoice">
-                    <group>
-                        <field string="Supplier" name="partner_id"
+                    <div class="oe_title">
+                        <h1>
+                            <field name="number" class="oe_inline"/>
+                        </h1>
+                        <h2>
+                            <field name="origin" placeholder="PO0025"/>from
+                            <field string="Supplier" name="partner_id"
                               on_change="onchange_partner_id(type,partner_id,date_invoice,payment_term, partner_bank_id,company_id)"
                               context="{'default_customer': 0, 'search_default_supplier': 1, 'default_supplier': 1}"
-                              domain="[('supplier', '=', True)]" invisible="1"/>
+                              domain="[('supplier', '=', True)]"/>
+                        </h2>
+                    </div>
+                    <group>
                         <group>
                             <field name="date_invoice"/>
                             <field name="date_due"/>
-                            <field name="period_id" domain="[('state', '=', 'draft')]"
-                                groups="account.group_account_user" widget="selection"/>
+                            <field name="type" invisible="1"/>
+                            <field name="period_id" domain="[('state', '=', 'draft')]" groups="account.group_account_user" widget="selection"/>
                         </group>
                         <group>
                             <field name="fiscal_position" widget="selection"/>
                             <field name="currency_id"/>
+                            <field domain="[('company_id', '=', company_id), ('type', '=', 'payable')]" name="account_id" groups="account.group_account_user" invisible="1"/>
                         </group>
-                    </group>
-                    <group>
+                        <group>
                             <label for="reference"/>
                             <div>
-                                <field name="reference_type"/>
                                 <field name="reference" placeholder="Payment Reference"/>
                             </div>
+                        </group>
                     </group>
                     <notebook>
                         <page string="Invoice">
@@ -228,7 +236,9 @@
                             <group col="4">
                                 <field domain="[('partner_id', '=', partner_id)]" name="partner_bank_id" on_change="onchange_partner_bank(partner_bank_id)"/>
                                 <field name="user_id"/>
+                                <field name="name" invisible="1"/>
                                 <newline/>
+                                <field name="move_id" groups="account.group_account_user" invisible="1"/>
                                 <field name="payment_term" widget="selection"/>
                                 <field name="company_id" on_change="onchange_company_id(company_id,partner_id,type,invoice_line,currency_id)" widget="selection" groups="base.group_multi_company"/>
                             </group>