← Back to branch summary

~openerp-dev/openobject-server/7.0-opw-586924-dhs

« back to all changes in this revision

Viewing changes to openerp/addons/base/ir/ir_sequence.py

  • Committer: Purnendu Singh (OpenERP)
  • Date: 2013-05-14 12:21:52 UTC
  • mfrom: (4917.1.56 openobject-server)
  • Revision ID: psi@tinyerp.com-20130514122152-53xyolualt7twkl3
[FIX] merge with main server

Show diffs side-by-side

added added

removed removed

Lines of Context:
openerp/addons/base/ir/ir_sequence.py
217
217
    def next_by_id(self, cr, uid, sequence_id, context=None):
218
218
        """ Draw an interpolated string using the specified sequence."""
219
219
        self.check_access_rights(cr, uid, 'read')
220
 
        company_ids = self.pool.get('res.company').search(cr, uid, [], order='company_id', context=context) + [False]
 
220
        company_ids = self.pool.get('res.company').search(cr, uid, [], context=context) + [False]
221
221
        ids = self.search(cr, uid, ['&',('id','=', sequence_id),('company_id','in',company_ids)])
222
222
        return self._next(cr, uid, ids, context)
223
223
 
234
234
                specific company will get higher priority. 
235
235
        """
236
236
        self.check_access_rights(cr, uid, 'read')
237
 
        company_ids = self.pool.get('res.company').search(cr, uid, [], order='company_id', context=context) + [False]
238
 
        ids = self.search(cr, uid, ['&',('code','=', sequence_code),('company_id','in',company_ids)])
 
237
        company_ids = self.pool.get('res.company').search(cr, uid, [], context=context) + [False]
 
238
        ids = self.search(cr, uid, ['&', ('code', '=', sequence_code), ('company_id', 'in', company_ids)])
239
239
        return self._next(cr, uid, ids, context)
240
240
 
241
241
    def get_id(self, cr, uid, sequence_code_or_id, code_or_id='id', context=None):