diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-09-20 17:33:22 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-09-20 17:34:45 +0200 |
| commit | 64e43808b79badb5869a8d73cc1cc3f3b3aa8e12 (patch) | |
| tree | 9a22d5f6c03073a4d10faedea8df23a5211e8b8f /odoo/addons/base/wizard | |
| parent | 944891ced081cda3b8b3db5faf3b7ac23b6b4ce8 (diff) | |
| parent | 58a83d12228fbbd4e9dde542e133d264204ee0f3 (diff) | |
[MERGE] forward port branch saas-12.5 up to 58a83d12228
Diffstat (limited to 'odoo/addons/base/wizard')
| -rw-r--r-- | odoo/addons/base/wizard/base_document_layout.py | 2 | ||||
| -rw-r--r-- | odoo/addons/base/wizard/base_document_layout_views.xml | 2 | ||||
| -rw-r--r-- | odoo/addons/base/wizard/base_language_install.py | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/odoo/addons/base/wizard/base_document_layout.py b/odoo/addons/base/wizard/base_document_layout.py index 00d6cbd7883..afbe91f3c8e 100644 --- a/odoo/addons/base/wizard/base_document_layout.py +++ b/odoo/addons/base/wizard/base_document_layout.py @@ -28,7 +28,7 @@ class BaseDocumentLayout(models.TransientModel): primary_color = fields.Char(related='company_id.primary_color', readonly=False) secondary_color = fields.Char(related='company_id.secondary_color', readonly=False) - custom_colors = fields.Boolean(compute="_compute_custom_colors") + custom_colors = fields.Boolean(compute="_compute_custom_colors", readonly=False) logo_primary_color = fields.Char(compute="_compute_logo_colors") logo_secondary_color = fields.Char(compute="_compute_logo_colors") diff --git a/odoo/addons/base/wizard/base_document_layout_views.xml b/odoo/addons/base/wizard/base_document_layout_views.xml index 8cb49407f05..53f76eb34be 100644 --- a/odoo/addons/base/wizard/base_document_layout_views.xml +++ b/odoo/addons/base/wizard/base_document_layout_views.xml @@ -19,7 +19,7 @@ <div class="o_document_layout_colors"> <field name="primary_color" widget="color" class="mb-4" /> <field name="secondary_color" widget="color" class="mb-4" /> - <button class="btn btn-link" title="Reset to logo colors"> + <button class="btn btn-link" title="Reset to logo colors" attrs="{'invisible': [('custom_colors', '=', False)]}"> <label for="custom_colors" class="fa fa-refresh mb-4" string="" /> </button> </div> diff --git a/odoo/addons/base/wizard/base_language_install.py b/odoo/addons/base/wizard/base_language_install.py index 3d5c804af34..e8bd93991ac 100644 --- a/odoo/addons/base/wizard/base_language_install.py +++ b/odoo/addons/base/wizard/base_language_install.py @@ -35,6 +35,8 @@ class BaseLanguageInstall(models.TransientModel): mods = self.env['ir.module.module'].search([('state', '=', 'installed')]) mods.with_context(overwrite=self.overwrite)._update_translations(self.lang) self.state = 'done' + self.env.cr.execute('ANALYZE ir_translation') + return { 'name': _('Language Pack'), 'view_mode': 'form', |