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] [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>