Merge lp:~openerp-dev/openobject-addons/trunk-bug-726092-ara into lp:openobject-addons

[Ashvin Rathod (OpenERP)]

Hello,

Fix: #726092 [6-stab] journal sequence not respected

Thanks,
ara

[OpenERP buildbot (openerp-buildbot)]

product/test/product_report.yml: 'int' object is unsubscriptable
account/test/account_fiscalyear_close_state.yml: 'int' object is unsubscriptable
project/test/test_project_delegation.yml: 'int' object is unsubscriptable
project_long_term/test/test_schedule_phases_case1.yml: 'int' object is unsubscriptable
account_invoice_layout/test/account_invoice_layout_report.yml: 'int' object is unsubscriptable

review: Disapprove

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

review: Approve

=== 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 13:36:38 +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')
@@ -329,15 +330,18 @@
                 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')
+                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({
-                    'name': number
+                    'name': st_number
                 })
 
             vals.update({
                 'date': time.strftime("%Y-%m-%d %H:%M:%S"),
                 'state': 'open',
-
             })
             self.write(cr, uid, [statement.id], vals, context=context)
         return True