diff options
| author | RGA(Open ERP) <> | 2010-06-04 11:51:45 +0530 |
|---|---|---|
| committer | Vir (Open ERP) <vir@tinyerp.com> | 2010-06-04 11:51:45 +0530 |
| commit | fba4d8075c6d9655e12e8ab47b04cec1b2648ffb (patch) | |
| tree | 83bc5e2f472947203eb74a0c896961ddb3fae5b2 /addons/base_setup | |
| parent | 222abd4e03a566ce43e07c5130cb4c470f7e7513 (diff) | |
[IMP] Improvements in Configuration wizard
bzr revid: vir@tinyerp.com-20100604062145-2d23i9y84ticq0cg
Diffstat (limited to 'addons/base_setup')
| -rw-r--r-- | addons/base_setup/base_setup_todo.xml | 2 | ||||
| -rw-r--r-- | addons/base_setup/gtk_contact_form.py | 5 | ||||
| -rw-r--r-- | addons/base_setup/gtk_contact_form.xml | 4 |
3 files changed, 4 insertions, 7 deletions
diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml index 97c9ea0d301..2d6b400d2c5 100644 --- a/addons/base_setup/base_setup_todo.xml +++ b/addons/base_setup/base_setup_todo.xml @@ -28,9 +28,9 @@ <field name="currency" widget="selection"/><field name="street"/> <field name="zip"/> <field name="street2"/> - <field name="city"/> <field name="country_id"/> <field name="state_id"/> + <field name="city"/> <field name="email"/> <field name="phone"/> <field name="website"/> diff --git a/addons/base_setup/gtk_contact_form.py b/addons/base_setup/gtk_contact_form.py index a9fde39ffde..c62951b13b7 100644 --- a/addons/base_setup/gtk_contact_form.py +++ b/addons/base_setup/gtk_contact_form.py @@ -71,7 +71,6 @@ class base_gtkcontactform(osv.osv_memory): 'other':fields.boolean('Other'), 'ebook':fields.boolean('ebook'), 'updates':fields.boolean('Updates'), - 'contact_me':fields.boolean('Contact Me'), } def execute(self, cr, uid, ids, context=None): if context is None: @@ -81,10 +80,10 @@ class base_gtkcontactform(osv.osv_memory): company_data = self.pool.get('base.setup.company').read(cr, uid, company_id, context=context) company_data = company_data and company_data[0] or {} country = '' - + if company_data.get('country_id', False): country = self.pool.get('res.country').read(cr, uid, company_data['country_id'],['name'], context=context)['name'] - + for res in self.read(cr, uid, ids, context=context): email = res.get('email','') result = "\ncompany: "+ tools.ustr(company_data.get('name','')) diff --git a/addons/base_setup/gtk_contact_form.xml b/addons/base_setup/gtk_contact_form.xml index c5578f9bc9a..41711032bf0 100644 --- a/addons/base_setup/gtk_contact_form.xml +++ b/addons/base_setup/gtk_contact_form.xml @@ -24,9 +24,7 @@ <group string="res_config_contents" position="replace"> <group colspan="4" height="450" width="600"> <group colspan="4"> - <field name="contact_me" nolabel="1"/> - <label align="0.0" string="I accept to be contacted by OpenERP." colspan="3"/> - <field name="ebook" nolabel="1"/> + <field name="ebook" nolabel="1"/> <label align="0.0" string="I want to receive the Open ERP ebook (PDF) by email." colspan="3"/> <field name="updates" nolabel="1"/> <label align="0.0" string="Yes, I would like to receive information updates from OpenERP." colspan="3"/> |