Merge lp:~openerp-dev/openobject-server/trunk-bug-863221-nch into lp:openobject-server

[Naresh(OpenERP)]

[Olivier Dony (Odoo) (odo-openerp)]

Looks good, but when merging I suggest we also:

 - change the search() in _next_by_* to use order="company_id" to give higher priority to company-specific
   sequences when no sequence is found for preferred company (this will work because NULLs are sorted
   last in PostgreSQL)
 - add something in the docstrings to mention that force_company can be passed

review: Approve

=== modified file 'openerp/addons/base/ir/ir_sequence.py'
--- openerp/addons/base/ir/ir_sequence.py	2011-10-07 14:54:06 +0000
+++ openerp/addons/base/ir/ir_sequence.py	2011-11-14 11:13:11 +0000
@@ -189,7 +189,14 @@
     def _next(self, cr, uid, seq_ids, context=None):
         if not seq_ids:
             return False
-        seq = self.read(cr, uid, seq_ids[:1], ['implementation','number_next','prefix','suffix','padding'])[0]
+        if context is None:
+            context = {}
+        force_company = context.get('force_company')
+        if force_company is None:
+            force_company = self.pool.get('res.users').browse(cr, uid, uid).company_id.id
+        sequences = self.read(cr, uid, seq_ids, ['company_id', 'implementation','number_next','prefix','suffix','padding'])
+        preferred_sequences = [s for s in sequences if s['company_id'] and s['company_id'][0] == force_company ]
+        seq = preferred_sequences[0] if preferred_sequences else sequences[0]
         if seq['implementation'] == 'standard':
             cr.execute("SELECT nextval('ir_sequence_%03d')" % seq['id'])
             seq['number_next'] = cr.fetchone()