From 8a886b6dd09b7fd1186da3ed20aa095d333acff1 Mon Sep 17 00:00:00 2001 From: pinky <> Date: Wed, 27 Dec 2006 14:59:09 +0000 Subject: [PATCH] Fixed typo: ZIP -> Zip code New window for graph chart menu bzr revid: pinky-e5cc29be4c733ac04830782638aa67ed8047bcfa --- bin/addons/base/res/partner/partner.py | 2 +- bin/tools/convert.py | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/bin/addons/base/res/partner/partner.py b/bin/addons/base/res/partner/partner.py index aa0a12ebe2d..560d440afc1 100644 --- a/bin/addons/base/res/partner/partner.py +++ b/bin/addons/base/res/partner/partner.py @@ -352,7 +352,7 @@ class res_partner_address(osv.osv): 'name': fields.char('Contact Name', size=64), 'street': fields.char('Street', size=128), 'street2': fields.char('Street2', size=128), - 'zip': fields.char('Zip', change_default=True, size=24), + 'zip': fields.char('Zip code', change_default=True, size=24), 'city': fields.char('City', size=128), 'state_id': fields.many2one("res.country.state", 'State', domain="[('country_id','=',country_id)]"), 'country_id': fields.many2one('res.country', 'Country'), diff --git a/bin/tools/convert.py b/bin/tools/convert.py index a7963f0c304..90523b52867 100644 --- a/bin/tools/convert.py +++ b/bin/tools/convert.py @@ -208,8 +208,13 @@ class xml_import(object): action_type,action_mode = cr.fetchone() if action_type=='tree': values['icon'] = 'STOCK_INDENT' + print 'INDENT' elif action_mode and action_mode.startswith('tree'): values['icon'] = 'STOCK_JUSTIFY_FILL' + print 'FILL' + elif action_mode and action_mode.startswith('graph'): + values['icon'] = 'terp-account' + print 'COLOR' if rec.hasAttribute('sequence'): values['sequence'] = int(rec.getAttribute('sequence')) if rec.hasAttribute('icon'): @@ -221,6 +226,7 @@ class xml_import(object): g_ids.extend(self.pool.get('res.groups').search(cr, self.uid, [('name', '=', group)])) values['groups_id'] = [(6, 0, g_ids)] xml_id = rec.getAttribute('id').encode('utf8') + print values pid = self.pool.get('ir.model.data')._update(cr, self.uid, 'ir.ui.menu', self.module, values, xml_id, idx==len(m_l)-1, mode=self.mode, res_id=res and res[0] or False) elif res: # the menuitem already exists