Ila Rana(Open ERP) has proposed merging
lp:~openerp-dev/openobject-server/6.0-opw-10420-ira into
lp:openobject-server/6.0.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-server/6.0-opw-10420-ira/+merge/66545
--
https://code.launchpad.net/~openerp-dev/openobject-server/6.0-opw-10420-ira/+merge/66545
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-server/6.0-opw-10420-ira.
=== modified file 'bin/addons/base/ir/ir_sequence.py'
--- bin/addons/base/ir/ir_sequence.py 2010-12-10 22:42:58 +0000
+++ bin/addons/base/ir/ir_sequence.py 2011-07-01 05:22:28 +0000
@@ -76,14 +76,15 @@
def get_id(self, cr, uid, sequence_id, test='id', context=None):
assert test in ('code','id')
company_id = self.pool.get('res.users').read(cr, uid, uid, ['company_id'], context=context)['company_id'][0] or None
+ child_company_ids = self.pool.get('res.company').search(cr, uid, [('id', 'child_of', [company_id])])
cr.execute('''SELECT id, number_next, prefix, suffix, padding
FROM ir_sequence
WHERE %s=%%s
AND active=true
- AND (company_id = %%s or company_id is NULL)
+ AND (company_id in %%s or company_id is NULL)
ORDER BY company_id, id
FOR UPDATE NOWAIT''' % test,
- (sequence_id, company_id))
+ (sequence_id, tuple(child_company_ids)))
res = cr.dictfetchone()
if res:
cr.execute('UPDATE ir_sequence SET number_next=number_next+number_increment WHERE id=%s AND active=true', (res['id'],))
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
