diff options
| author | ced <> | 2007-07-19 13:47:25 +0000 |
|---|---|---|
| committer | ced <> | 2007-07-19 13:47:25 +0000 |
| commit | 1affdedfd38a580833eef4cbe64f4b785392bee8 (patch) | |
| tree | 56eb3da2e2128e1193b544a8b7a6220778e08e4c /addons/base_setup/wizard/wizard_base_setup.py | |
| parent | ee5d9a1d3cb7bfe73e389a15393eca7b21ce8078 (diff) | |
Merge branch 'master' of ssh://ced@dev.tinyerp.com//home/ced/terp
Conflicts:
server/bin/addons/hr_timesheet_invoice/report/cost_ledger.py
bzr revid: ced-53d5b1eb97f770d60b281ecb4ff118898d110112
Diffstat (limited to 'addons/base_setup/wizard/wizard_base_setup.py')
| -rw-r--r-- | addons/base_setup/wizard/wizard_base_setup.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/addons/base_setup/wizard/wizard_base_setup.py b/addons/base_setup/wizard/wizard_base_setup.py index 4abb18c9240..326ba7da8f8 100644 --- a/addons/base_setup/wizard/wizard_base_setup.py +++ b/addons/base_setup/wizard/wizard_base_setup.py @@ -74,6 +74,7 @@ view_form_company = """<?xml version="1.0"?> <field name="state_id" align="0.0"/> <field name="email" align="0.0"/> <field name="phone" align="0.0"/> + <field name="currency" align="0.0"/> <separator string="Report header" colspan="4"/> <newline/> <field name="rml_header1" align="0.0" colspan="4"/> @@ -131,6 +132,7 @@ class wizard_base_setup(wizard.interface): return {} company=company_obj.browse(cr, uid, ids)[0] self.fields['name']['default']=company.name + self.fields['currency']['default']=company.currency_id.id return {} #self.fields['rml_header1']['default']=company.rml_header1 #self.fields['rml_footer1']['default']=company.rml_footer1 @@ -188,6 +190,7 @@ class wizard_base_setup(wizard.interface): 'rml_header1': form['rml_header1'], 'rml_footer1': form['rml_footer1'], 'rml_footer2': form['rml_footer2'], + 'currency_id': form['currency'], }) partner_obj.write(cr, uid, [company.partner_id.id], { 'name': form['name'], @@ -200,7 +203,7 @@ class wizard_base_setup(wizard.interface): 'city': form['city'], 'email': form['email'], 'phone': form['phone'], - 'country_id': form['country_id'] + 'country_id': form['country_id'], } if form['state_id'] > 0: values['state_id']=form['state_id'] @@ -307,6 +310,12 @@ class wizard_base_setup(wizard.interface): 'type': 'char', 'size': 64, }, + 'currency': { + 'string': 'Currency', + 'type': 'many2one', + 'relation': 'res.currency', + 'required': True, + }, 'rml_header1':{ 'string': 'Report Header', 'type': 'char', |