=== modified file 'account/account.py' --- account/account.py 2010-02-28 13:02:51 +0000 +++ account/account.py 2010-03-09 12:17:34 +0000 @@ -511,14 +511,14 @@ 'centralisation': fields.boolean('Centralised counterpart', help="Check this box to determine that each entry of this journal won't create a new counterpart but will share the same counterpart. This is used in fiscal year closing."), 'update_posted': fields.boolean('Allow Cancelling Entries'), 'group_invoice_lines': fields.boolean('Group invoice lines', help="If this box is checked, the system will try to group the accounting lines when generating them from invoices."), - 'sequence_id': fields.many2one('ir.sequence', 'Entry Sequence', help="The sequence gives the display order for a list of journals", required=True), + 'sequence_id': fields.many2one('ir.sequence', 'Entry Sequence', help="The sequence is used for numbering the moves of this journal", required=True), 'user_id': fields.many2one('res.users', 'User', help="The user responsible for this journal"), 'groups_id': fields.many2many('res.groups', 'account_journal_group_rel', 'journal_id', 'group_id', 'Groups'), 'currency': fields.many2one('res.currency', 'Currency', help='The currency used to enter statement'), 'entry_posted': fields.boolean('Skip \'Draft\' State for Created Entries', help='Check this box if you don\'t want new account moves to pass through the \'draft\' state and instead goes directly to the \'posted state\' without any manual validation.'), 'company_id': fields.related('default_credit_account_id','company_id',type='many2one', relation="res.company", string="Company"), 'invoice_sequence_id': fields.many2one('ir.sequence', 'Invoice Sequence', \ - help="The sequence used for invoice numbers in this journal."), + help="The sequence used for invoice or statement numbers in this journal."), } _defaults = { === modified file 'account/account_bank_statement.py' --- account/account_bank_statement.py 2010-02-28 13:02:51 +0000 +++ account/account_bank_statement.py 2010-03-09 12:14:13 +0000 @@ -369,8 +369,10 @@ else: raise osv.except_osv(_('Error'), _('No fiscalyear is defined for this period ')) + # FIXME for numbering the bank statements we use the invoice sequence + # for numbering the moves the accout journal move sequence shouzld be used sequence_main_id = account_journal_obj.browse(cursor, user, journal_id, - context=context).sequence_id.id + context=context).invoice_sequence_id.id if sequence_main_id: sequence_ids = self.pool.get('account.sequence.fiscalyear').search(cursor,user,[('fiscalyear_id','=', fiscalyear_id),('sequence_main_id' ,'=', sequence_main_id)]) #sequence_ids = self.pool.get('account.sequence.fiscalyear').search(cursor,user,[('sequence_main_id' ,'=', sequence_main_id)])