openerp-dev-web team mailing list archive

["Ashvin Rathod \(OpenERP\)" <ara@xxxxxxxxxxx>]

Ashvin Rathod (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/trunk-bug-726090-ara into lp:openobject-addons.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  Bug #726090 in Postler: "Make mark as unread/important more discoverable"
  https://bugs.launchpad.net/postler/+bug/726090

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-726090-ara/+merge/53804

Hello,

fix: #726090 [6-stab] journal sequence not respected

Thanks,
ara
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-bug-726090-ara/+merge/53804
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/trunk-bug-726090-ara.

=== modified file 'account/account_cash_statement.py'
--- account/account_cash_statement.py	2011-03-03 08:52:22 +0000
+++ account/account_cash_statement.py	2011-03-17 12:45:22 +0000
@@ -320,6 +320,7 @@
         """ Changes statement state to Running.
         @return: True
         """
+        obj_seq = self.pool.get('ir.sequence')
         if context is None:
             context = {}
         statement_pool = self.pool.get('account.bank.statement')
@@ -328,15 +329,20 @@
             if not self._user_allow(cr, uid, statement.id, context=context):
                 raise osv.except_osv(_('Error !'), (_('User %s does not have rights to access %s journal !') % (statement.user_id.name, statement.journal_id.name)))
 
-            if statement.name and statement.name == '/':
-                number = self.pool.get('ir.sequence').get(cr, uid, 'account.cash.statement')
-                vals.update({
-                    'name': number
-                })
+            if not statement.name == '/':
+                st_number = statement.name
+
+            else:
+                if statement.journal_id.sequence_id:
+                    c = {'fiscalyear_id': statement.period_id.fiscalyear_id.id}
+                    st_number = obj_seq.get_id(cr, uid, statement.journal_id.sequence_id.id, context=c)
+                else:
+                    st_number = obj_seq.get(cr, uid, 'account.cash.statement')
 
             vals.update({
                 'date': time.strftime("%Y-%m-%d %H:%M:%S"),
                 'state': 'open',
+                'name': st_number
 
             })
             self.write(cr, uid, [statement.id], vals, context=context)