From 38cf26665d69235b59ef2e6662cad45847240441 Mon Sep 17 00:00:00 2001 From: Ila Rana Date: Fri, 1 Jul 2011 10:47:06 +0530 Subject: [PATCH 1/2] [FIX]:cash_register_can_not_open(case:10420) bzr revid: ira@tinyerp.com-20110701051706-68pgumkqg52ukz6k --- bin/addons/base/ir/ir_sequence.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/addons/base/ir/ir_sequence.py b/bin/addons/base/ir/ir_sequence.py index c4ea65caf6d..50e08312321 100644 --- a/bin/addons/base/ir/ir_sequence.py +++ b/bin/addons/base/ir/ir_sequence.py @@ -76,14 +76,15 @@ class ir_sequence(osv.osv): 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'],)) From c5c340ec927821f296cbee04562a8541aa2040aa Mon Sep 17 00:00:00 2001 From: Ila Rana Date: Mon, 4 Jul 2011 12:30:20 +0530 Subject: [PATCH 2/2] [FIX]:cash_register_can_not_open(case:10420) bzr revid: ira@tinyerp.com-20110704070020-emouw619tw6bmo68 --- bin/addons/base/ir/ir_sequence.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/bin/addons/base/ir/ir_sequence.py b/bin/addons/base/ir/ir_sequence.py index 50e08312321..4267e92d54d 100644 --- a/bin/addons/base/ir/ir_sequence.py +++ b/bin/addons/base/ir/ir_sequence.py @@ -75,8 +75,7 @@ class ir_sequence(osv.osv): 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])]) + company_ids = self.pool.get('res.company').search(cr, uid, [], context=context) cr.execute('''SELECT id, number_next, prefix, suffix, padding FROM ir_sequence WHERE %s=%%s @@ -84,7 +83,7 @@ class ir_sequence(osv.osv): AND (company_id in %%s or company_id is NULL) ORDER BY company_id, id FOR UPDATE NOWAIT''' % test, - (sequence_id, tuple(child_company_ids))) + (sequence_id, tuple(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'],))