[IMP] use augmented assignments
authorXavier Morel <xmo@openerp.com>
Fri, 14 Dec 2012 13:19:24 +0000 (14:19 +0100)
committerXavier Morel <xmo@openerp.com>
Fri, 14 Dec 2012 13:19:24 +0000 (14:19 +0100)
bzr revid: xmo@openerp.com-20121214131924-bpl48ht21ic4g34b

openerp/addons/base/ir/ir_ui_menu.py
openerp/addons/base/ir/ir_ui_view.py
openerp/addons/base/ir/ir_values.py

index 31d0c67..9b945da 100644 (file)
@@ -181,7 +181,7 @@ class ir_ui_menu(osv.osv):
             next_num=int(concat[0])+1
             datas['name']=rex.sub(('(%d)'%next_num),datas['name'])
         else:
-            datas['name']=datas['name']+'(1)'
+            datas['name'] += '(1)'
         self.write(cr,uid,[res],{'name':datas['name']})
         ids = ir_values_obj.search(cr, uid, [
             ('model', '=', 'ir.ui.menu'),
index 2f2a610..83a1a9a 100644 (file)
@@ -254,7 +254,7 @@ class view(osv.osv):
                 if label:
                     for lbl in eval(label):
                         if t.has_key(tools.ustr(lbl)) and tools.ustr(t[lbl])=='False':
-                            label_string = label_string + ' '
+                            label_string += ' '
                         else:
                             label_string = label_string + " " + tools.ustr(t[lbl])
                 labels[str(t['id'])] = (a['id'],label_string)
index 7af1178..af7751c 100644 (file)
@@ -307,10 +307,10 @@ class ir_values(osv.osv):
                    ORDER BY v.user_id, u.company_id"""
         params = ('default', model, uid, uid)
         if condition:
-            query = query % 'AND v.key2 = %s'
+            query %= 'AND v.key2 = %s'
             params += (condition[:200],)
         else:
-            query = query % 'AND v.key2 is NULL'
+            query %= 'AND v.key2 is NULL'
         cr.execute(query, params)
 
         # keep only the highest priority default for each field