odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

Fixed typo: ZIP -> Zip code 

New window for graph chart menu

bzr revid: pinky-e5cc29be4c733ac04830782638aa67ed8047bcfa
This commit is contained in:
pinky 2006-12-27 14:59:09 +00:00
parent 3f5cdcb81c
commit 8a886b6dd0
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/addons/base/res/partner/partner.py
View File

@ -352,7 +352,7 @@ class res_partner_address(osv.osv):
'name': fields.char('Contact Name', size=64), 'name': fields.char('Contact Name', size=64),
'street': fields.char('Street', size=128), 'street': fields.char('Street', size=128),
'street2': fields.char('Street2', 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), 'city': fields.char('City', size=128),
'state_id': fields.many2one("res.country.state", 'State', domain="[('country_id','=',country_id)]"), 'state_id': fields.many2one("res.country.state", 'State', domain="[('country_id','=',country_id)]"),
'country_id': fields.many2one('res.country', 'Country'), 'country_id': fields.many2one('res.country', 'Country'),

6
bin/tools/convert.py
View File

@ -208,8 +208,13 @@ class xml_import(object):
action_type,action_mode = cr.fetchone() action_type,action_mode = cr.fetchone()
if action_type=='tree': if action_type=='tree':
values['icon'] = 'STOCK_INDENT' values['icon'] = 'STOCK_INDENT'
print 'INDENT'
elif action_mode and action_mode.startswith('tree'): elif action_mode and action_mode.startswith('tree'):
values['icon'] = 'STOCK_JUSTIFY_FILL' 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'): if rec.hasAttribute('sequence'):
values['sequence'] = int(rec.getAttribute('sequence')) values['sequence'] = int(rec.getAttribute('sequence'))
if rec.hasAttribute('icon'): 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)])) g_ids.extend(self.pool.get('res.groups').search(cr, self.uid, [('name', '=', group)]))
values['groups_id'] = [(6, 0, g_ids)] values['groups_id'] = [(6, 0, g_ids)]
xml_id = rec.getAttribute('id').encode('utf8') 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) 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: elif res:
# the menuitem already exists # the menuitem already exists