From 0c375a3d6f0bd5e8622b52e2f27fafb79afead30 Mon Sep 17 00:00:00 2001
From: "pankita shah (Open ERP)" <shp@tinyerp.com>
Date: Mon, 3 Dec 2012 17:49:00 +0530
Subject: [PATCH 1/6] [IMP] improve data(Immediate Payment,15days) and remove
 data from data(30 Days end of Month,30% Advance, End 30 Days) and keep in
 demo

bzr revid: shp@tinyerp.com-20121203121900-fb52ryi5d2acolj8
---
 addons/account/data/account_data.xml | 42 ++++++++--------------------
 addons/account/demo/account_demo.xml | 31 ++++++++++++++++++++
 2 files changed, 43 insertions(+), 30 deletions(-)

diff --git a/addons/account/data/account_data.xml b/addons/account/data/account_data.xml
index 97bea14c1f2..c9b528e75f8 100644
--- a/addons/account/data/account_data.xml
+++ b/addons/account/data/account_data.xml
@@ -10,17 +10,19 @@
         <!--
         Payment term
         -->
-        <record id="account_payment_term" model="account.payment.term">
-            <field name="name">30 Days End of Month</field>
-            <field name="note">30 Days End of Month</field>
+        <record id="account_payment_term_Immediate" model="account.payment.term">
+            <field name="name">Immediate Payment</field>
+            <field name="note">Immediate Payment</field>
         </record>
-        <record id="account_payment_term_line" model="account.payment.term.line">
-            <field name="name">30 Days End of Month</field>
+
+        <record id="account_payment_term_line_immediate" model="account.payment.term.line">
+            <field name="name">Immediate Payment</field>
             <field name="value">balance</field>
-            <field eval="30" name="days"/>
-            <field eval="-1" name="days2"/>
-            <field eval="account_payment_term" name="payment_id"/>
+            <field eval="15" name="days"/>
+            <field eval="0" name="days2"/>
+            <field eval="account_payment_term_Immediate" name="payment_id"/>
         </record>
+
         <record forcecreate="True" id="decimal_payment" model="decimal.precision">
             <field name="name">Payment Term</field>
             <field name="digits">6</field>
@@ -30,6 +32,7 @@
             <field name="name">30 Net Days</field>
             <field name="note">30 Net Days</field>
         </record>
+
         <record id="account_payment_term_line_net" model="account.payment.term.line">
             <field name="name">30 Net Days</field>
             <field name="value">balance</field>
@@ -37,28 +40,7 @@
             <field eval="0" name="days2"/>
             <field eval="account_payment_term_net" name="payment_id"/>
         </record>
-
-        <record id="account_payment_term_advance" model="account.payment.term">
-            <field name="name">30% Advance End 30 Days</field>
-            <field name="note">30% Advance End 30 Days</field>
-        </record>
-        <record id="account_payment_term_line_advance1" model="account.payment.term.line">
-            <field name="name">30% Advance</field>
-            <field name="value">procent</field>
-            <field eval="3" name="sequence"/>
-            <field eval="0.300000" name="value_amount"/>
-            <field eval="0" name="days"/>
-            <field eval="0" name="days2"/>
-            <field eval="account_payment_term_advance" name="payment_id"/>
-        </record>
-        <record id="account_payment_term_line_advance2" model="account.payment.term.line">
-            <field name="name">Remaining Balance</field>
-            <field name="value">balance</field>
-            <field eval="30" name="days"/>
-            <field eval="-1" name="days2"/>
-            <field eval="account_payment_term_advance" name="payment_id"/>
-        </record>
-
+        
         <!--
         Account Journal Sequences
         -->
diff --git a/addons/account/demo/account_demo.xml b/addons/account/demo/account_demo.xml
index 0dff40ca19f..e2fe480c0bc 100644
--- a/addons/account/demo/account_demo.xml
+++ b/addons/account/demo/account_demo.xml
@@ -127,6 +127,37 @@
             <field eval="time.strftime('%Y')+'-12-31'" name="date_stop"/>
             <field name="company_id" ref="base.main_company"/>
         </record>
+        <record id="account_payment_term" model="account.payment.term">
+            <field name="name">30 Days End of Month</field>
+            <field name="note">30 Days End of Month</field>
+        </record>
+        <record id="account_payment_term_line" model="account.payment.term.line">
+            <field name="name">30 Days End of Month</field>
+            <field name="value">balance</field>
+            <field eval="30" name="days"/>
+            <field eval="-1" name="days2"/>
+            <field eval="account_payment_term" name="payment_id"/>
+        </record>
+            <record id="account_payment_term_advance" model="account.payment.term">
+            <field name="name">30% Advance End 30 Days</field>
+            <field name="note">30% Advance End 30 Days</field>
+        </record>
+        <record id="account_payment_term_line_advance1" model="account.payment.term.line">
+            <field name="name">30% Advance</field>
+            <field name="value">procent</field>
+            <field eval="3" name="sequence"/>
+            <field eval="0.300000" name="value_amount"/>
+            <field eval="0" name="days"/>
+            <field eval="0" name="days2"/>
+            <field eval="account_payment_term_advance" name="payment_id"/>
+        </record>
+        <record id="account_payment_term_line_advance2" model="account.payment.term.line">
+            <field name="name">Remaining Balance</field>
+            <field name="value">balance</field>
+            <field eval="30" name="days"/>
+            <field eval="-1" name="days2"/>
+            <field eval="account_payment_term_advance" name="payment_id"/>
+        </record>
 
         <record id="base.user_demo" model="res.users">
             <field name="groups_id" eval="[(4,ref('account.group_account_user'))]"/> 

From 7b6d5f0e93b307f188021e957c3c43898967c671 Mon Sep 17 00:00:00 2001
From: "Jalpesh Patel (OpenERP)" <pja@tinyerp.com>
Date: Tue, 4 Dec 2012 09:46:10 +0530
Subject: [PATCH 2/6] [IMP]remove sequece field and improve payment term form
 view

bzr revid: pja@tinyerp.com-20121204041610-vpqx0zf3rneokugx
---
 addons/account/account.py       |  6 ++----
 addons/account/account_view.xml | 20 +-------------------
 2 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 971bcec5bb0..c7c08df8c3b 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -101,10 +101,9 @@ class account_payment_term_line(osv.osv):
     _description = "Payment Term Line"
     _columns = {
         'name': fields.char('Line Name', size=32, required=True),
-        'sequence': fields.integer('Sequence', required=True, help="The sequence field is used to order the payment term lines from the lowest sequences to the higher ones"),
         'value': fields.selection([('procent', 'Percent'),
                                    ('balance', 'Balance'),
-                                   ('fixed', 'Fixed Amount')], 'Valuation',
+                                   ('fixed', 'Fixed Amount')], 'Computation',
                                    required=True, help="""Select here the kind of valuation related to this payment term line. Note that you should have your last line with the type 'Balance' to ensure that the whole amount will be treated."""),
 
         'value_amount': fields.float('Amount To Pay', digits_compute=dp.get_precision('Payment Term'), help="For percent enter a ratio between 0-1."),
@@ -115,10 +114,9 @@ class account_payment_term_line(osv.osv):
     }
     _defaults = {
         'value': 'balance',
-        'sequence': 5,
         'days2': 0,
     }
-    _order = "sequence"
+    _order = "days,value"
 
     def _check_percent(self, cr, uid, ids, context=None):
         obj = self.browse(cr, uid, ids[0], context=context)
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index e2c45af8cba..86e6a618cde 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1554,7 +1554,6 @@
             <field name="model">account.payment.term.line</field>
             <field name="arch" type="xml">
                 <tree string="Payment Term">
-                    <field name="sequence"/>
                     <field name="name"/>
                     <field name="value"/>
                     <field name="value_amount"/>
@@ -1570,7 +1569,6 @@
                 <form string="Payment Term" version="7.0">
                     <group>
                         <field name="name"/>
-                        <field name="sequence"/>
                     </group>
                     <group>
                         <group string="Amount Computation">
@@ -1583,22 +1581,6 @@
                         </group>
                     </group>
 
-                    <separator string="Example"/>
-                    <label string="At 14 net days 2 percent, remaining amount at 30 days end of month."/>
-                    <group>
-                        <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"/>
-                    </group>
-                    <group>
-                        <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"/>
-                    </group>
                 </form>
             </field>
         </record>
@@ -1621,7 +1603,7 @@
                         <field name="name"/>
                         <field name="active"/>
                     </group>
-                    <field name="note" placeholder="Note for the invoice..."/>
+                    <field name="note" placeholder="Payment term explanation for the customer..."/>
                     <separator string="Computation"/>
                     <field name="line_ids"/>
                 </form>

From f95959593378288f669ae1ab12717e194df5b606 Mon Sep 17 00:00:00 2001
From: "pankita shah (Open ERP)" <shp@tinyerp.com>
Date: Tue, 4 Dec 2012 10:45:30 +0530
Subject: [PATCH 3/6] [IMP] balance computation line in payment term

bzr revid: shp@tinyerp.com-20121204051530-4sx9r9m0uqmapous
---
 addons/account/account.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/addons/account/account.py b/addons/account/account.py
index 971bcec5bb0..0e333a7a579 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -94,6 +94,20 @@ class account_payment_term(osv.osv):
                 amount -= amt
         return result
 
+    def _check_balance_line(self, cr, uid, ids, context=None):
+        line_list = []
+        obj = self.browse(cr, uid, ids[0], context=context)
+        for ids in  obj.line_ids:
+            if ids.value == 'balance':
+                line_list.append(ids.value)
+        if len(line_list) > 1:
+            return False
+        return True
+        
+    _constraints = [
+        (_check_balance_line, 'A payment term should have one and only one "Balance" computation line.', ['value']),
+    ]
+
 account_payment_term()
 
 class account_payment_term_line(osv.osv):

From 62d0f3931d423d9841f0e6ec138544380993b760 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Tue, 4 Dec 2012 12:28:50 +0530
Subject: [PATCH 4/6] [IMP] Put a default value for payment term lines, make
 readonly amount to pay in list view, put % symbol when selection is
 percentage.

bzr revid: nco@tinyerp.com-20121204065850-dw3f79n61hla9x3c
---
 addons/account/account.py       |  4 ++--
 addons/account/account_view.xml | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index aa5f90a081e..49be6d7503c 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -114,7 +114,6 @@ class account_payment_term_line(osv.osv):
     _name = "account.payment.term.line"
     _description = "Payment Term Line"
     _columns = {
-        'name': fields.char('Line Name', size=32, required=True),
         'value': fields.selection([('procent', 'Percent'),
                                    ('balance', 'Balance'),
                                    ('fixed', 'Fixed Amount')], 'Computation',
@@ -128,7 +127,8 @@ class account_payment_term_line(osv.osv):
     }
     _defaults = {
         'value': 'balance',
-        'days2': 0,
+        'days': 30,
+        'days2': 1,
     }
     _order = "days,value"
 
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 86e6a618cde..20065edbc61 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1553,10 +1553,9 @@
             <field name="name">account.payment.term.line.tree</field>
             <field name="model">account.payment.term.line</field>
             <field name="arch" type="xml">
-                <tree string="Payment Term">
-                    <field name="name"/>
+                <tree string="Payment Term" editable="bottom">
                     <field name="value"/>
-                    <field name="value_amount"/>
+                    <field name="value_amount" readonly="1"/>
                     <field name="days"/>
                     <field name="days2"/>
                 </tree>
@@ -1567,13 +1566,14 @@
             <field name="model">account.payment.term.line</field>
             <field name="arch" type="xml">
                 <form string="Payment Term" version="7.0">
-                    <group>
-                        <field name="name"/>
-                    </group>
                     <group>
                         <group string="Amount Computation">
                             <field name="value"/>
-                            <field name="value_amount" attrs="{'readonly':[('value','=','balance')]}"/>
+                            <label for="value_amount" string="Amount To Pay"/>
+                            <div>
+                                <field name="value_amount" attrs="{'readonly':[('value','=','balance')]}" class="oe_inline"/>
+                                <label string="%%" class="oe_inline" attrs="{'invisible':['!',('value','=','procent')]}"/>
+                            </div>
                         </group>
                         <group string="Due Date Computation">
                             <field name="days"/>

From 8e974146ab8183c1a8d2627796a3b41844d73d84 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Tue, 4 Dec 2012 18:31:50 +0530
Subject: [PATCH 5/6] [FIX]: Remove editable tree view.

bzr revid: atp@tinyerp.com-20121204130150-ng08xtg1mipt5590
---
 addons/account/account_view.xml      |  4 ++--
 addons/account/data/account_data.xml | 15 ++++++++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index b87feb50a40..b82ab6cef06 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1553,7 +1553,7 @@
             <field name="name">account.payment.term.line.tree</field>
             <field name="model">account.payment.term.line</field>
             <field name="arch" type="xml">
-                <tree string="Payment Term" editable="bottom">
+                <tree string="Payment Term">
                     <field name="value"/>
                     <field name="value_amount" attrs="{'readonly':[('value','=','balance')]}"/>
                     <field name="days"/>
@@ -1569,7 +1569,7 @@
                     <group>
                         <group string="Amount Computation">
                             <field name="value"/>
-                            <label for="value_amount" string="Amount To Pay"/>
+                            <label for="value_amount" string="Amount To Pay" attrs="{'invisible':[('value','=','balance')]}" />
                             <div>
                                 <field name="value_amount" attrs="{'invisible':[('value','=','balance')]}" class="oe_inline"/>
                                 <label string="%%" class="oe_inline" attrs="{'invisible':['!',('value','=','procent')]}"/>
diff --git a/addons/account/data/account_data.xml b/addons/account/data/account_data.xml
index c14bac1dff3..dc53429b6bd 100644
--- a/addons/account/data/account_data.xml
+++ b/addons/account/data/account_data.xml
@@ -18,11 +18,24 @@
         <record id="account_payment_term_line_immediate" model="account.payment.term.line">
             <field name="name">Immediate Payment</field>
             <field name="value">balance</field>
-            <field eval="15" name="days"/>
+            <field eval="0" name="days"/>
             <field eval="0" name="days2"/>
             <field eval="account_payment_term_immediate" name="payment_id"/>
         </record>
 
+        <record id="account_payment_term_15days" model="account.payment.term">
+            <field name="name">15 Days</field>
+            <field name="note">15 Days</field>
+        </record>
+
+        <record id="account_payment_term_line_15days" model="account.payment.term.line">
+            <field name="name">15 Days</field>
+            <field name="value">balance</field>
+            <field eval="15" name="days"/>
+            <field eval="0" name="days2"/>
+            <field eval="account_payment_term_15days" name="payment_id"/>
+        </record>
+
         <record forcecreate="True" id="decimal_payment" model="decimal.precision">
             <field name="name">Payment Term</field>
             <field name="digits">6</field>

From 00e42737f29de12dc43c279c079b13836c57a15d Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Tue, 4 Dec 2012 19:09:50 +0530
Subject: [PATCH 6/6] [FIX]: Fix usability issue

bzr revid: atp@tinyerp.com-20121204133950-hf6c2hwq0ktreke9
---
 addons/account/account_view.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index b82ab6cef06..7dcada33791 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1568,12 +1568,12 @@
                 <form string="Payment Term" version="7.0">
                     <group>
                         <group string="Amount Computation">
-                            <field name="value"/>
-                            <label for="value_amount" string="Amount To Pay" attrs="{'invisible':[('value','=','balance')]}" />
-                            <div>
-                                <field name="value_amount" attrs="{'invisible':[('value','=','balance')]}" class="oe_inline"/>
-                                <label string="%%" class="oe_inline" attrs="{'invisible':['!',('value','=','procent')]}"/>
-                            </div>
+	                        <field name="value"/>
+	                        <label for="value_amount" string="Amount To Pay"  attrs="{'invisible':[('value','=','balance')]}"/>
+	                        <div attrs="{'invisible':[('value','=','balance')]}">
+	                            <field name="value_amount" class="oe_inline"/>
+	                            <label string="%%" class="oe_inline" attrs="{'invisible':['!',('value','=','procent')]}" />
+	                        </div>
                         </group>
                         <group string="Due Date Computation">
                             <field name="days"/>