From d910aba991ca6f9b07dd0119bab2dcbec607a07d Mon Sep 17 00:00:00 2001 From: ivan deng Date: Thu, 19 Mar 2020 15:13:00 +0800 Subject: [PATCH 1/2] update grn menu --- app_odoo_customize/__manifest__.py | 2 +- app_odoo_customize/models/ir_module_module.py | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app_odoo_customize/__manifest__.py b/app_odoo_customize/__manifest__.py index fba60d8d..373ebd7e 100644 --- a/app_odoo_customize/__manifest__.py +++ b/app_odoo_customize/__manifest__.py @@ -23,7 +23,7 @@ { 'name': 'Customize odoo OEM (Boost, My Odoo)', - 'version': '13.20.03.15', + 'version': '13.20.03.19', 'author': 'Sunpop.cn', 'category': 'Productivity', 'website': 'https://www.sunpop.cn', diff --git a/app_odoo_customize/models/ir_module_module.py b/app_odoo_customize/models/ir_module_module.py index e4e59f74..7dc33c15 100644 --- a/app_odoo_customize/models/ir_module_module.py +++ b/app_odoo_customize/models/ir_module_module.py @@ -14,7 +14,8 @@ class IrModule(models.Model): # installed_version = fields.Char('Latest Version', compute='_get_latest_version') # latest_version = fields.Char('Installed Version', readonly=True) - local_updatable = fields.Boolean('Local updatable', compute='_get_latest_version', default=False, store=True) + local_updatable = fields.Boolean('Local updatable', compute='_get_latest_version', + compute_sudo=True, default=False, store=True) def module_multi_uninstall(self): """ Perform the various steps required to uninstall a module completely @@ -34,8 +35,9 @@ class IrModule(models.Model): @api.depends('name') def _get_latest_version(self): - super(IrModule, self)._get_latest_version() - for rec in self: - rec.local_updatable = False - if rec.installed_version and rec.latest_version and operator.gt(rec.installed_version, rec.latest_version): - rec.local_updatable = True + default_version = modules.adapt_version('1.0') + for module in self: + module.installed_version = self.get_module_info(module.name).get('version', default_version) + if module.installed_version and module.latest_version and operator.gt(module.installed_version, module.latest_version): + module.local_updatable = True + From a59da8d8186d2d40671f5f79287b1954ccf0e6ea Mon Sep 17 00:00:00 2001 From: ivan deng Date: Thu, 19 Mar 2020 18:52:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?update=20grn=20=E8=81=94=E7=B3=BB=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app_base_chinese/__manifest__.py | 2 +- app_base_chinese/i18n/zh_CN.po | 2 +- app_base_chinese/views/res_partner_views.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app_base_chinese/__manifest__.py b/app_base_chinese/__manifest__.py index 790972df..e09f5447 100644 --- a/app_base_chinese/__manifest__.py +++ b/app_base_chinese/__manifest__.py @@ -18,7 +18,7 @@ { 'name': "App base chinese，中国化基本模块增强", - 'version': '13.20.02.20', + 'version': '13.20.03.19', 'author': 'Sunpop.cn', 'category': 'Base', 'website': 'https://www.sunpop.cn', diff --git a/app_base_chinese/i18n/zh_CN.po b/app_base_chinese/i18n/zh_CN.po index 8f7abb75..c05fd86d 100644 --- a/app_base_chinese/i18n/zh_CN.po +++ b/app_base_chinese/i18n/zh_CN.po @@ -91,4 +91,4 @@ msgstr "单号规则" #: model:ir.model.fields,field_description:app_base_chinese.field_res_partner__short_name #: model:ir.model.fields,field_description:app_base_chinese.field_res_users__short_name msgid "Short Name" -msgstr "缩写" +msgstr "简称" diff --git a/app_base_chinese/views/res_partner_views.xml b/app_base_chinese/views/res_partner_views.xml index 6ff29d60..25ab25d2 100644 --- a/app_base_chinese/views/res_partner_views.xml +++ b/app_base_chinese/views/res_partner_views.xml @@ -12,7 +12,7 @@ - +