diff --git a/CHANGELOG b/CHANGELOG index 8a4ec92c53..5b0d8932a1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,4 @@ +* Add number and sequence on statement line * Switch journal debit/credit account usage Version 3.2.0 - 2014-04-21 diff --git a/statement.py b/statement.py index d239cf5bab..dbc501894f 100644 --- a/statement.py +++ b/statement.py @@ -345,6 +345,8 @@ class Line(ModelSQL, ModelView): __name__ = 'account.statement.line' statement = fields.Many2One('account.statement', 'Statement', required=True, ondelete='CASCADE') + sequence = fields.Integer('Sequence') + number = fields.Char('Number') date = fields.Date('Date', required=True) amount = fields.Numeric('Amount', required=True, digits=(16, Eval('_parent_statement', {}).get('currency_digits', 2))) @@ -369,6 +371,7 @@ class Line(ModelSQL, ModelView): @classmethod def __setup__(cls): super(Line, cls).__setup__() + cls._order.insert(0, ('sequence', 'ASC')) cls._error_messages.update({ 'debit_credit_account_statement_journal': ('Please provide ' 'debit and credit account on statement journal "%s".'), @@ -383,6 +386,11 @@ class Line(ModelSQL, ModelView): 'Amount should be a positive or negative value.'), ] + @staticmethod + def order_sequence(tables): + table, _ = tables[None] + return [table.sequence == None, table.sequence] + @staticmethod def default_amount(): return Decimal(0) diff --git a/view/statement_line_form.xml b/view/statement_line_form.xml index 8b65af0712..9d2932e5e5 100644 --- a/view/statement_line_form.xml +++ b/view/statement_line_form.xml @@ -4,6 +4,10 @@ this repository contains the full copyright notices and license terms. -->