diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index 52e1b20a744..45736c2948f 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -126,7 +126,7 @@ class account_bank_statement(osv.osv): currency_id = res[statement_id] res[statement_id] = (currency_id, currency_names[currency_id]) return res - + _order = "date desc" _name = "account.bank.statement" _description = "Bank Statement" @@ -158,8 +158,7 @@ class account_bank_statement(osv.osv): } _defaults = { - 'name': lambda self, cr, uid, context=None: \ - self.pool.get('ir.sequence').get(cr, uid, 'account.bank.statement'), + 'name': lambda *a: "/", 'date': lambda *a: time.strftime('%Y-%m-%d'), 'state': lambda *a: 'draft', 'balance_start': _default_balance_start, @@ -192,7 +191,7 @@ class account_bank_statement(osv.osv): 'value':res, 'context':context, } - + def button_confirm_bank(self, cr, uid, ids, context={}): done = [] res_currency_obj = self.pool.get('res.currency') @@ -368,8 +367,13 @@ class account_bank_statement(osv.osv): if st.journal_id.entry_posted: account_move_obj.write(cr, uid, [move_id], {'state':'posted'}) + self.log(cr, uid, st.id, 'Statement %s is confirmed and entries are created.' % st.name) done.append(st.id) + + next_number = self.pool.get('ir.sequence').get(cr, uid, 'account.bank.statement') + self.write(cr, uid, [st.id], {'name':next_number}, context) + self.write(cr, uid, done, {'state':'confirm'}, context=context) return True @@ -432,7 +436,6 @@ class account_bank_statement(osv.osv): account_bank_statement() - class account_bank_statement_reconcile(osv.osv): _name = "account.bank.statement.reconcile" _description = "Statement Reconcile" diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py index f618bcfeefd..e36521d7b45 100644 --- a/addons/account/account_cash_statement.py +++ b/addons/account/account_cash_statement.py @@ -215,7 +215,6 @@ class account_cash_statement(osv.osv): } _defaults = { 'state': lambda *a: 'draft', - 'name': lambda *a: '/', 'date': lambda *a:time.strftime("%Y-%m-%d %H:%M:%S"), 'user_id': lambda self, cr, uid, context=None: uid, 'company_id': _get_company, @@ -314,7 +313,7 @@ class account_cash_statement(osv.osv): if not self._user_allow(cr, uid, ids, statement, context={}): raise osv.except_osv(_('Error !'), _('User %s does not have rights to access %s journal !' % (statement.user_id.name, statement.journal_id.name))) - number = self.pool.get('ir.sequence').get(cr, uid, statement.journal_id.sequence_id.code) + number = self.pool.get('ir.sequence').get(cr, uid, 'account.cash.statement') # if len(statement.starting_details_ids) > 0: # sid = [] diff --git a/addons/account/data/account_data2.xml b/addons/account/data/account_data2.xml index 235716e4c94..9a06727e021 100644 --- a/addons/account/data/account_data2.xml +++ b/addons/account/data/account_data2.xml @@ -460,7 +460,6 @@ - Bank Statement account.bank.statement @@ -468,10 +467,21 @@ Account Bank Statement account.bank.statement - St. %(month)s/%(day)s + St. %(month)s/%(day)s/ + + + + + + Cash Statement + account.cash.statement + + + Account Cash Statement + account.cash.statement + Cr. %(month)s/%(day)s/ - diff --git a/addons/account/data/account_invoice.xml b/addons/account/data/account_invoice.xml index 96407d926f2..74428196bfd 100644 --- a/addons/account/data/account_invoice.xml +++ b/addons/account/data/account_invoice.xml @@ -7,8 +7,8 @@ + Sequences types for invoices + --> Account Invoice Out account.invoice.out_invoice