From 5d3d3868f6f78556164e382c3160b1bc8fde66ea Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 14 Dec 2012 14:19:24 +0100 Subject: [PATCH] [IMP] use augmented assignments bzr revid: xmo@openerp.com-20121214131924-bpl48ht21ic4g34b --- openerp/addons/base/ir/ir_ui_menu.py | 2 +- openerp/addons/base/ir/ir_ui_view.py | 2 +- openerp/addons/base/ir/ir_values.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openerp/addons/base/ir/ir_ui_menu.py b/openerp/addons/base/ir/ir_ui_menu.py index 31d0c6714fb..9b945da5fe3 100644 --- a/openerp/addons/base/ir/ir_ui_menu.py +++ b/openerp/addons/base/ir/ir_ui_menu.py @@ -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'), diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py index 2f2a610877d..83a1a9a8bcb 100644 --- a/openerp/addons/base/ir/ir_ui_view.py +++ b/openerp/addons/base/ir/ir_ui_view.py @@ -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) diff --git a/openerp/addons/base/ir/ir_values.py b/openerp/addons/base/ir/ir_values.py index 7af11789225..af7751c950b 100644 --- a/openerp/addons/base/ir/ir_values.py +++ b/openerp/addons/base/ir/ir_values.py @@ -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