diff options
| -rw-r--r-- | addons/account/views/res_config_settings_views.xml | 2 | ||||
| -rw-r--r-- | odoo/addons/base/models/res_company.py | 11 | ||||
| -rw-r--r-- | odoo/addons/base/views/res_company_views.xml | 2 | ||||
| -rw-r--r-- | odoo/addons/base/views/res_currency_views.xml | 15 |
4 files changed, 13 insertions, 17 deletions
diff --git a/addons/account/views/res_config_settings_views.xml b/addons/account/views/res_config_settings_views.xml index e02640721fe..2c23fdf635b 100644 --- a/addons/account/views/res_config_settings_views.xml +++ b/addons/account/views/res_config_settings_views.xml @@ -146,7 +146,7 @@ <div class="content-group"> <div class="row mt16"> <label for="currency_id" class="col-md-3 o_light_label"/> - <field name="currency_id" options="{'no_create_edit': True, 'no_open': True}"/> + <field name="currency_id" options="{'no_create_edit': True, 'no_open': True}" context="{'active_test': False}"/> </div> </div> </div> diff --git a/odoo/addons/base/models/res_company.py b/odoo/addons/base/models/res_company.py index 84330680a82..aa5a395f8b1 100644 --- a/odoo/addons/base/models/res_company.py +++ b/odoo/addons/base/models/res_company.py @@ -221,11 +221,22 @@ class Company(models.Model): # The write is made on the user to set it automatically in the multi company group. self.env.user.write({'company_ids': [(4, company.id)]}) partner.write({'company_id': company.id}) + + # Make sure that the selected currency is enabled + if vals.get('currency_id'): + currency = self.env['res.currency'].browse(vals['currency_id']) + if not currency.active: + currency.write({'active': True}) return company @api.multi def write(self, values): self.clear_caches() + # Make sure that the selected currency is enabled + if values.get('currency_id'): + currency = self.env['res.currency'].browse(values['currency_id']) + if not currency.active: + currency.write({'active': True}) return super(Company, self).write(values) @api.constrains('parent_id') diff --git a/odoo/addons/base/views/res_company_views.xml b/odoo/addons/base/views/res_company_views.xml index ab9f202b176..57b08a2eaef 100644 --- a/odoo/addons/base/views/res_company_views.xml +++ b/odoo/addons/base/views/res_company_views.xml @@ -36,7 +36,7 @@ <field name="email"/> <field name="vat"/> <field name="company_registry"/> - <field name="currency_id" options="{'no_create': True, 'no_open': True}" id="company_currency"/> + <field name="currency_id" options="{'no_create': True, 'no_open': True}" id="company_currency" context="{'active_test': False}"/> <field name="parent_id" groups="base.group_multi_company"/> <field name="sequence" invisible="1"/> <field name="report_footer" placeholder="e.g. Your Bank Accounts, one per line"/> diff --git a/odoo/addons/base/views/res_currency_views.xml b/odoo/addons/base/views/res_currency_views.xml index 6ed8c9e6358..6c9de0ca574 100644 --- a/odoo/addons/base/views/res_currency_views.xml +++ b/odoo/addons/base/views/res_currency_views.xml @@ -171,20 +171,5 @@ <field name="context">{'active_test': False}</field> </record> - <!-- We override the view res_company here because the action wasn't defined before --> - <record id="action_view_company_form_link_2_currencies" model="ir.ui.view"> - <field name="name">res.company.form</field> - <field name="model">res.company</field> - <field name="inherit_id" ref="base.view_company_form"/> - <field name="arch" type="xml"> - <xpath expr="//field[@id='company_currency']" position="after"> - <label for="id" invisible="1"/> - <p class="text-muted"> - <a href="" type="action" name="%(base.action_currency_all_form)d">Activate more currencies</a>. - </p> - </xpath> - </field> - </record> - </data> </odoo> |