From 8693b8108a5c76115654e0d719249417590da9fc Mon Sep 17 00:00:00 2001
From: "Atik Agewan (OpenERP)" <aag@tinyerp.com>
Date: Thu, 13 Oct 2011 16:10:34 +0530
Subject: [PATCH 1/7] [Fix] Account :[Account]In menu
 Accounting/Configuration/Miscellaneous/Payment Terms Improve some usability
 Issue

lp bug: https://launchpad.net/bugs/873234 fixed

bzr revid: aag@tinyerp.com-20111013104034-znmers3jo3h6e7j0
---
 addons/account/account_view.xml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 2ae910a36b3..74157fb8f19 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1714,19 +1714,20 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Payment Term">
-                    <field name="name" select="1"/>
-                    <field name="sequence"/>
-                    <group colspan="2" col="4">
-                        <separator string="Amount Computation" colspan="4"/>
-                        <field name="value" colspan="4"/>
-                        <field name="value_amount" colspan="4" attrs="{'readonly':[('value','=','balance')]}"/>
+                    <group>
+	                    <group colspan="2" col="4">
+	                        <field name="name" select="1"/>
+	                        <separator string="Amount Computation" colspan="4"/>
+	                        <field name="value" colspan="4"/>
+	                        <field name="value_amount" colspan="4" attrs="{'readonly':[('value','=','balance')]}"/>
+	                    </group>
+	                    <group colspan="2" col="4">
+	                        <field name="sequence"/>
+	                        <separator string="Due Date Computation" colspan="4"/>
+	                        <field name="days" colspan="4"/>
+	                        <field name="days2" colspan="4"/>
+	                    </group>
                     </group>
-                    <group colspan="2" col="4">
-                        <separator string="Due date Computation" colspan="4"/>
-                        <field name="days" colspan="4"/>
-                        <field name="days2" colspan="4"/>
-                    </group>
-                    <label string=""/>
                     <newline/>
                     <label string="Example: at 14 net days 2 percents, remaining amount at 30 days end of month." colspan="4"/>
                     <group colspan="2" col="2">
@@ -1769,9 +1770,8 @@
                     <separator colspan="4" string="Information"/>
                     <field name="name" select="1"/>
                     <field name="active" select="1"/>
-                    <separator colspan="4" string="Description on invoices"/>
+                    <separator colspan="4" string="Description On Invoices"/>
                     <field colspan="4" name="note" nolabel="1"/>
-                    <separator colspan="4" string="Computation"/>
                     <field colspan="4" name="line_ids" nolabel="1"/>
                 </form>
             </field>

From d5426481fa919b8896ddbdf0e9eb64d5c95db53a Mon Sep 17 00:00:00 2001
From: "Atik Agewan (OpenERP)" <aag@tinyerp.com>
Date: Wed, 19 Oct 2011 15:18:46 +0530
Subject: [PATCH 2/7] [IMP]Account: Add Computation seprator

bzr revid: aag@tinyerp.com-20111019094846-1zmij1x1gmo8w45q
---
 addons/account/account_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 004ccaba186..394387cae4e 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1772,6 +1772,7 @@
                     <field name="active" select="1"/>
                     <separator colspan="4" string="Description On Invoices"/>
                     <field colspan="4" name="note" nolabel="1"/>
+                    <separator colspan="4" string="Computation"/>
                     <field colspan="4" name="line_ids" nolabel="1"/>
                 </form>
             </field>

From 9f1d8942527e9545aa79b6fa433ca58ca91a7f31 Mon Sep 17 00:00:00 2001
From: "Atik Agewan (OpenERP)" <aag@tinyerp.com>
Date: Wed, 19 Oct 2011 16:53:27 +0530
Subject: [PATCH 3/7] [IMP]Account: Add seprator

bzr revid: aag@tinyerp.com-20111019112327-xbhaossu4i28efmw
---
 addons/account/account_view.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 394387cae4e..45836140648 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1729,7 +1729,8 @@
 	                    </group>
                     </group>
                     <newline/>
-                    <label string="Example: at 14 net days 2 percents, remaining amount at 30 days end of month." colspan="4"/>
+                    <separator string="Examples" colspan="4"/>
+                    <label string="1: at 14 net days 2 percents, remaining amount at 30 days end of month." colspan="4"/>
                     <group colspan="2" col="2">
                         <label string="Line 1:" colspan="2"/>
                         <label string="  valuation: percent"/>

From 3a106f0d881d92336d7baaef38e6e685d9574b82 Mon Sep 17 00:00:00 2001
From: "Atik Agewan (OpenERP)" <aag@tinyerp.com>
Date: Wed, 19 Oct 2011 17:24:22 +0530
Subject: [PATCH 4/7] [IMP]:Examples => Example

bzr revid: aag@tinyerp.com-20111019115422-o60bq1uhu6pdkr90
---
 addons/account/account_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 45836140648..8f899281aa5 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1729,7 +1729,7 @@
 	                    </group>
                     </group>
                     <newline/>
-                    <separator string="Examples" colspan="4"/>
+                    <separator string="Example" colspan="4"/>
                     <label string="1: at 14 net days 2 percents, remaining amount at 30 days end of month." colspan="4"/>
                     <group colspan="2" col="2">
                         <label string="Line 1:" colspan="2"/>

From e1f44eaaac0cf27bb7a584cb2b1017201f16a818 Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 19 Oct 2011 17:31:50 +0530
Subject: [PATCH 5/7] [IMP]: account: Removed indexing example of payement term
 in payment line view as there is only one example

bzr revid: rpa@tinyerp.com-20111019120150-9rdg720tpdre7jzf
---
 addons/account/account_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 8f899281aa5..de4725f9ddb 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1730,7 +1730,7 @@
                     </group>
                     <newline/>
                     <separator string="Example" colspan="4"/>
-                    <label string="1: at 14 net days 2 percents, remaining amount at 30 days end of month." colspan="4"/>
+                    <label string="At 14 net days 2 percents, remaining amount at 30 days end of month." colspan="4"/>
                     <group colspan="2" col="2">
                         <label string="Line 1:" colspan="2"/>
                         <label string="  valuation: percent"/>

From 280a57484e923aa10d9601f2d490468e9f2dfa7f Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 19 Oct 2011 17:40:37 +0530
Subject: [PATCH 6/7] [IMP]: account: Usabililty Improvements in payment term
 line view

bzr revid: rpa@tinyerp.com-20111019121037-uhvtkpzii0qomluc
---
 addons/account/account_view.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index de4725f9ddb..ad2d616c2e5 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1733,18 +1733,18 @@
                     <label string="At 14 net days 2 percents, remaining amount at 30 days end of month." colspan="4"/>
                     <group colspan="2" col="2">
                         <label string="Line 1:" colspan="2"/>
-                        <label string="  valuation: percent"/>
-                        <label string="  number of days: 14"/>
-                        <label string="  value amount: 0.02"/>
-                        <label string="  day of the month: 0"/>
+                        <label string="  Valuation: percent"/>
+                        <label string="  Number of Days: 14"/>
+                        <label string="  Value amount: 0.02"/>
+                        <label string="  Day of the Month: 0"/>
                     </group>
                     <newline/>
                     <group colspan="2" col="2">
                         <label string="Line 2:" colspan="2"/>
-                        <label string="  valuation: balance"/>
-                        <label string="  number of days: 30"/>
-                        <label string="  value amount: n.a"/>
-                        <label string="  day of the month= -1"/>
+                        <label string="  Valuation: balance"/>
+                        <label string="  Number of Days: 30"/>
+                        <label string="  Value amount: n.a"/>
+                        <label string="  Day of the Month= -1"/>
                     </group>
                 </form>
             </field>

From abe5a3e1d05613176660cf4b596dd6e4be4c5216 Mon Sep 17 00:00:00 2001
From: "Rucha (Open ERP)" <rpa@tinyerp.com>
Date: Wed, 19 Oct 2011 17:50:53 +0530
Subject: [PATCH 7/7] [FIX]: account: typo + improvement in payment term line
 view

bzr revid: rpa@tinyerp.com-20111019122053-qr4uuz9z244s389u
---
 addons/account/account_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index ad2d616c2e5..3912f665916 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1730,10 +1730,10 @@
                     </group>
                     <newline/>
                     <separator string="Example" colspan="4"/>
-                    <label string="At 14 net days 2 percents, remaining amount at 30 days end of month." colspan="4"/>
+                    <label string="At 14 net days 2 percent, remaining amount at 30 days end of month." colspan="4"/>
                     <group colspan="2" col="2">
                         <label string="Line 1:" colspan="2"/>
-                        <label string="  Valuation: percent"/>
+                        <label string="  Valuation: Percent"/>
                         <label string="  Number of Days: 14"/>
                         <label string="  Value amount: 0.02"/>
                         <label string="  Day of the Month: 0"/>
@@ -1741,7 +1741,7 @@
                     <newline/>
                     <group colspan="2" col="2">
                         <label string="Line 2:" colspan="2"/>
-                        <label string="  Valuation: balance"/>
+                        <label string="  Valuation: Balance"/>
                         <label string="  Number of Days: 30"/>
                         <label string="  Value amount: n.a"/>
                         <label string="  Day of the Month= -1"/>