removed bad code

[odoo/odoo.git] / bin / addons / base / ir / ir_sequence.py

diff --git a/bin/addons/base/ir/ir_sequence.py b/bin/addons/base/ir/ir_sequence.py
index 202aac7..f48ea0f 100644 (file)
--- a/bin/addons/base/ir/ir_sequence.py
+++ b/bin/addons/base/ir/ir_sequence.py
@@ -22,6 +22,7 @@
 
 import time
 from osv import fields,osv
+import pooler
 
 class ir_sequence_type(osv.osv):
     _name = 'ir.sequence.type'
@@ -69,13 +70,12 @@ class ir_sequence(osv.osv):
             'sec': time.strftime('%S'),
         }
 
-    def get_id(self, cr, uid, sequence_id, test='id=%s', context={}):
+    def get_id(self, cr, uid, sequence_id, test='id=%s', context=None):
         try:
-            cr.execute('lock table ir_sequence')
-            cr.execute('select id,number_next,number_increment,prefix,suffix,padding from ir_sequence where '+test+' and active=True', (sequence_id,))
+            cr.execute('SELECT id, number_next, prefix, suffix, padding FROM ir_sequence WHERE '+test+' AND active=%s FOR UPDATE', (sequence_id, True))
             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'],))
+                cr.execute('UPDATE ir_sequence SET number_next=number_next+number_increment WHERE id=%s AND active=%s', (res['id'], True))
                 if res['number_next']:
                     return self._process(res['prefix']) + '%%0%sd' % res['padding'] % res['number_next'] + self._process(res['suffix'])
                 else: