audrius/app-odoo
1
0
Fork 0
mirror of https://github.com/guohuadeng/app-odoo.git synced 2025-02-23 04:11:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '13.0' of https://github.com/guohuadeng/app-odoo into 13.0

Browse Source
This commit is contained in:
Ivan x390
2020-03-20 02:37:20 +08:00
parent 1ec5b2fcc1 a59da8d818
commit c3b82a7d98
5 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app_base_chinese/__manifest__.py
View File

@@ -18,7 +18,7 @@
{ {
'name': "App base chinese，中国化基本模块增强", 'name': "App base chinese，中国化基本模块增强",
'version': '13.20.02.20', 'version': '13.20.03.19',
'author': 'Sunpop.cn', 'author': 'Sunpop.cn',
'category': 'Base', 'category': 'Base',
'website': 'https://www.sunpop.cn', 'website': 'https://www.sunpop.cn',

2
app_base_chinese/i18n/zh_CN.po
View File

@@ -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_partner__short_name
#: model:ir.model.fields,field_description:app_base_chinese.field_res_users__short_name #: model:ir.model.fields,field_description:app_base_chinese.field_res_users__short_name
msgid "Short Name" msgid "Short Name"
msgstr "缩写" msgstr "简称"

2
app_base_chinese/views/res_partner_views.xml
View File

@@ -12,7 +12,7 @@
<!--<xpath expr="//field[@name='ref']" position="move"/>--> <!--<xpath expr="//field[@name='ref']" position="move"/>-->
<!--</xpath>--> <!--</xpath>-->
<xpath expr="//field[@name='type']" position="after"> <xpath expr="//field[@name='type']" position="after">
<field name="short_name" invisible="1"/> <field name="short_name"/>
</xpath> </xpath>
<!-- 信用额度 --> <!-- 信用额度 -->
<xpath expr="//field[@name='category_id']" position="after"> <xpath expr="//field[@name='category_id']" position="after">

2
app_odoo_customize/__manifest__.py
View File

@@ -23,7 +23,7 @@
{ {
'name': 'Customize odoo OEM (Boost, My Odoo)', 'name': 'Customize odoo OEM (Boost, My Odoo)',
'version': '13.20.03.15', 'version': '13.20.03.19',
'author': 'Sunpop.cn', 'author': 'Sunpop.cn',
'category': 'Productivity', 'category': 'Productivity',
'website': 'https://www.sunpop.cn', 'website': 'https://www.sunpop.cn',

14
app_odoo_customize/models/ir_module_module.py
View File

@@ -14,7 +14,8 @@ class IrModule(models.Model):
# installed_version = fields.Char('Latest Version', compute='_get_latest_version') # installed_version = fields.Char('Latest Version', compute='_get_latest_version')
# latest_version = fields.Char('Installed Version', readonly=True) # 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): def module_multi_uninstall(self):
""" Perform the various steps required to uninstall a module completely """ Perform the various steps required to uninstall a module completely
@@ -34,8 +35,9 @@ class IrModule(models.Model):
@api.depends('name') @api.depends('name')
def _get_latest_version(self): def _get_latest_version(self):
super(IrModule, self)._get_latest_version() default_version = modules.adapt_version('1.0')
for rec in self: for module in self:
rec.local_updatable = False module.installed_version = self.get_module_info(module.name).get('version', default_version)
if rec.installed_version and rec.latest_version and operator.gt(rec.installed_version, rec.latest_version): if module.installed_version and module.latest_version and operator.gt(module.installed_version, module.latest_version):
rec.local_updatable = True module.local_updatable = True