diff --git a/addons/account/account.py b/addons/account/account.py index 3567e911968..36bd8a47fe6 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -114,11 +114,9 @@ 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), - '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."), @@ -129,10 +127,10 @@ class account_payment_term_line(osv.osv): } _defaults = { 'value': 'balance', - 'sequence': 5, - 'days2': 0, + 'days': 30, + 'days2': 1, } - _order = "sequence" + _order = "value desc,days" 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..b87feb50a40 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -1553,11 +1553,9 @@ account.payment.term.line.tree account.payment.term.line - - - + - + @@ -1568,37 +1566,20 @@ account.payment.term.line
- - - - - + - - -
@@ -1621,7 +1602,7 @@ - +