From d2db22a75d82cad0ad9bf2ed2992c5b4e649166c Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Fri, 11 Jul 2008 13:42:24 +0200 Subject: [PATCH] manual merge from lp branch bzr revid: christophe@tinyerp.com-20080711114224-ye5o80dj45dd1i04 --- bin/addons/base/ir/ir_ui_menu.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/bin/addons/base/ir/ir_ui_menu.py b/bin/addons/base/ir/ir_ui_menu.py index 4d993bcc0ff..13445bb8df9 100644 --- a/bin/addons/base/ir/ir_ui_menu.py +++ b/bin/addons/base/ir/ir_ui_menu.py @@ -29,6 +29,7 @@ from osv import fields, osv from osv.orm import browse_null, browse_record +import re def one_in(setA, setB): """Check the presence of an element of setA in setB @@ -121,6 +122,15 @@ class ir_ui_menu(osv.osv): def copy(self, cr, uid, id, default=None, context=None): ir_values_obj = self.pool.get('ir.values') res = super(ir_ui_menu, self).copy(cr, uid, id, context=context) + datas=self.read(cr,uid,[res],['name'])[0] + rex=re.compile('\([0-9]+\)') + concat=rex.findall(datas['name']) + if concat: + next_num=eval(concat[0])+1 + datas['name']=rex.sub(('(%d)'%next_num),datas['name']) + else: + datas['name']=datas['name']+'(1)' + self.write(cr,uid,[res],{'name':datas['name']}) ids = ir_values_obj.search(cr, uid, [ ('model', '=', 'ir.ui.menu'), ('res_id', '=', id),