From 2419a46d91d440389d73008db1a49e6e8f728466 Mon Sep 17 00:00:00 2001 From: "hda@tinyerp.com" <> Date: Mon, 20 Oct 2008 18:32:18 +0530 Subject: Improved database Installation wizard and remove unusual menus bzr revid: hda@tinyerp.com-20081020130218-8dtpjf16uzbdhuqq --- addons/base_setup/wizard/wizard_base_setup.py | 38 ++++++++++++++++++++++----- 1 file changed, 32 insertions(+), 6 deletions(-) (limited to 'addons/base_setup/wizard/wizard_base_setup.py') diff --git a/addons/base_setup/wizard/wizard_base_setup.py b/addons/base_setup/wizard/wizard_base_setup.py index f8de1e6bfa8..f8a211d9fd9 100644 --- a/addons/base_setup/wizard/wizard_base_setup.py +++ b/addons/base_setup/wizard/wizard_base_setup.py @@ -52,6 +52,8 @@ view_form_profit = """ view_form_company = """
+ + @@ -67,12 +69,18 @@ view_form_company = """ + + + - + + + +
""" view_form_update = """ @@ -106,11 +114,14 @@ class wizard_base_setup(wizard.interface): ids=module_obj.search(cr, uid, [('category_id', '=', 'Profile'), ('state', '<>', 'uninstallable')]) res=[(m.id, m.shortdesc) for m in module_obj.browse(cr, uid, ids)] + print ">>>>>",res res.append((-1, 'Minimal Profile')) res.sort() return res - +# def _get_service_profile(self, cr, uid, context={}): +# print cr,uid,self,context +# return pooler.get_pool(cr.dbname).get('ir.module.module').search(cr, uid, [('name','=','profile_service')])[0] def _get_company(self, cr, uid, data, context): pool=pooler.get_pool(cr.dbname) @@ -121,7 +132,8 @@ class wizard_base_setup(wizard.interface): company=company_obj.browse(cr, uid, ids)[0] self.fields['name']['default']=company.name self.fields['currency']['default']=company.currency_id.id - return {} + serv_pro_id = pooler.get_pool(cr.dbname).get('ir.module.module').search(cr, uid, [('name','=','profile_service')])[0] + return {'profile':serv_pro_id} #self.fields['rml_header1']['default']=company.rml_header1 #self.fields['rml_footer1']['default']=company.rml_footer1 #self.fields['rml_footer2']['default']=company.rml_footer2 @@ -161,9 +173,18 @@ class wizard_base_setup(wizard.interface): res.sort(lambda x,y: cmp(x[1],y[1])) return res + def _get_currency(self, cr, uid, context): + pool=pooler.get_pool(cr.dbname) + currency_obj=pool.get('res.currency') + ids=currency_obj.search(cr, uid, []) + res=[(currency.id, currency.name) for currency in currency_obj.browse(cr, uid, ids)] + res.sort(lambda x,y: cmp(x[1],y[1])) + return res + def _update(self, cr, uid, data, context): pool=pooler.get_pool(cr.dbname) form=data['form'] + print data if 'profile' in data['form'] and data['form']['profile'] > 0: module_obj=pool.get('ir.module.module') module_obj.state_update(cr, uid, [data['form']['profile']], 'to install', ['uninstalled'], context) @@ -180,6 +201,7 @@ class wizard_base_setup(wizard.interface): 'rml_footer1': form['rml_footer1'], 'rml_footer2': form['rml_footer2'], 'currency_id': form['currency'], + 'logo': form['logo'], }) partner_obj.write(cr, uid, [company.partner_id.id], { 'name': form['name'], @@ -275,7 +297,7 @@ class wizard_base_setup(wizard.interface): 'string':'Profile', 'type':'selection', 'selection':_get_profiles, - 'default': -1, +# 'default': _get_service_profile, 'required': True, }, @@ -326,8 +348,8 @@ class wizard_base_setup(wizard.interface): }, 'currency': { 'string': 'Currency', - 'type': 'many2one', - 'relation': 'res.currency', + 'type': 'selection', + 'selection':_get_currency, 'required': True, }, 'rml_header1':{ @@ -354,6 +376,10 @@ IBAN: BE74 1262 0121 6907 - SWIFT: CPDF BE71 - VAT: BE0477.472.701""", 'type': 'char', 'size': 200, }, + 'logo':{ + 'string': 'Logo', + 'type': 'binary', + }, } states={ 'init':{ -- cgit v1.2.3 From bc07a30a080ef3c1b828032929e166cc91c6b71e Mon Sep 17 00:00:00 2001 From: "hda@tinyerp.com" <> Date: Mon, 20 Oct 2008 18:37:45 +0530 Subject: Bugfix and remove prints bzr revid: hda@tinyerp.com-20081020130745-2g7x2y41hpp39svv --- addons/base_setup/wizard/wizard_base_setup.py | 34 ++++----------------------- 1 file changed, 4 insertions(+), 30 deletions(-) (limited to 'addons/base_setup/wizard/wizard_base_setup.py') diff --git a/addons/base_setup/wizard/wizard_base_setup.py b/addons/base_setup/wizard/wizard_base_setup.py index f8a211d9fd9..d469ef9d072 100644 --- a/addons/base_setup/wizard/wizard_base_setup.py +++ b/addons/base_setup/wizard/wizard_base_setup.py @@ -114,15 +114,10 @@ class wizard_base_setup(wizard.interface): ids=module_obj.search(cr, uid, [('category_id', '=', 'Profile'), ('state', '<>', 'uninstallable')]) res=[(m.id, m.shortdesc) for m in module_obj.browse(cr, uid, ids)] - print ">>>>>",res res.append((-1, 'Minimal Profile')) res.sort() return res -# def _get_service_profile(self, cr, uid, context={}): -# print cr,uid,self,context -# return pooler.get_pool(cr.dbname).get('ir.module.module').search(cr, uid, [('name','=','profile_service')])[0] - def _get_company(self, cr, uid, data, context): pool=pooler.get_pool(cr.dbname) company_obj=pool.get('res.company') @@ -132,29 +127,10 @@ class wizard_base_setup(wizard.interface): company=company_obj.browse(cr, uid, ids)[0] self.fields['name']['default']=company.name self.fields['currency']['default']=company.currency_id.id - serv_pro_id = pooler.get_pool(cr.dbname).get('ir.module.module').search(cr, uid, [('name','=','profile_service')])[0] - return {'profile':serv_pro_id} - #self.fields['rml_header1']['default']=company.rml_header1 - #self.fields['rml_footer1']['default']=company.rml_footer1 - #self.fields['rml_footer2']['default']=company.rml_footer2 - #if not company.partner_id.address: - # return {} - #address=company.partner_id.address[0] - #self.fields['street']['default']=address.street - #self.fields['street2']['default']=address.street2 - #self.fields['zip']['default']=address.zip - #self.fields['city']['default']=address.city - #self.fields['email']['default']=address.email - #self.fields['phone']['default']=address.phone - #if address.state_id: - # self.fields['state_id']['default']=address.state_id.id - #else: - # self.fields['state_id']['default']=-1 - #if address.country_id: - # self.fields['country_id']['default']=address.country_id.id - #else: - # self.fields['country_id']['default']=-1 - #return {} + serv_pro_id = pooler.get_pool(cr.dbname).get('ir.module.module').search(cr, uid, [('name','=','profile_service')]) or False + if serv_pro_id: + return {'profile':serv_pro_id[0]} + return {} def _get_states(self, cr, uid, context): pool=pooler.get_pool(cr.dbname) @@ -184,12 +160,10 @@ class wizard_base_setup(wizard.interface): def _update(self, cr, uid, data, context): pool=pooler.get_pool(cr.dbname) form=data['form'] - print data if 'profile' in data['form'] and data['form']['profile'] > 0: module_obj=pool.get('ir.module.module') module_obj.state_update(cr, uid, [data['form']['profile']], 'to install', ['uninstalled'], context) - company_obj=pool.get('res.company') partner_obj=pool.get('res.partner') address_obj=pool.get('res.partner.address') -- cgit v1.2.3