update common from yan

This commit is contained in:
ivan deng
2020-07-25 20:08:54 +08:00
parent 0702ccf172
commit ec062d74dc
7 changed files with 20 additions and 176 deletions

View File

@@ -7,7 +7,7 @@ from odoo.exceptions import UserError, ValidationError
class ResCompany(models.Model): class ResCompany(models.Model):
_inherit = 'res.company' _inherit = 'res.company'
short_name = fields.Char('Short Name', related='partner_id.short_name', readonly=False, store=True) short_name = fields.Char('Short Name', related='partner_id.short_name', readonly=False)
# 当传参 show_short_name 时,只显示简称 # 当传参 show_short_name 时,只显示简称
def name_get(self): def name_get(self):

View File

@@ -23,7 +23,7 @@
{ {
'name': 'Customize odoo OEM (Boost, My Odoo)', 'name': 'Customize odoo OEM (Boost, My Odoo)',
'version': '13.20.07.13', 'version': '13.20.07.24',
'author': 'Sunpop.cn', 'author': 'Sunpop.cn',
'category': 'Productivity', 'category': 'Productivity',
'website': 'https://www.sunpop.cn', 'website': 'https://www.sunpop.cn',
@@ -133,6 +133,8 @@
'views/ir_module_module_views.xml', 'views/ir_module_module_views.xml',
'views/ir_translation_views.xml', 'views/ir_translation_views.xml',
'views/ir_ui_menu_views.xml', 'views/ir_ui_menu_views.xml',
'views/ir_ui_view_views.xml',
'views/ir_model_fields_views.xml',
# data # data
'data/ir_config_parameter_data.xml', 'data/ir_config_parameter_data.xml',
'data/ir_module_module_data.xml', 'data/ir_module_module_data.xml',

View File

@@ -1,81 +0,0 @@
<?xml version="1.0"?>
<openerp>
<data noupdate="0">
<record id="app_system_name" model="ir.config_parameter">
<field name="key">app_system_name</field>
<field name="value">odooApp13</field>
</record>
<record id="app_show_lang" model="ir.config_parameter">
<field name="key">app_show_lang</field>
<field name="value">True</field>
</record>
<record id="app_show_debug" model="ir.config_parameter">
<field name="key">app_show_debug</field>
<field name="value">True</field>
</record>
<record id="app_show_documentation" model="ir.config_parameter">
<field name="key">app_show_documentation</field>
<field name="value">True</field>
</record>
<record id="app_show_documentation_dev" model="ir.config_parameter">
<field name="key">app_show_documentation_dev</field>
<field name="value">True</field>
</record>
<record id="app_show_support" model="ir.config_parameter">
<field name="key">app_show_support</field>
<field name="value">True</field>
</record>
<record id="app_show_account" model="ir.config_parameter">
<field name="key">app_show_account</field>
<field name="value">True</field>
</record>
<record id="app_show_enterprise" model="ir.config_parameter">
<field name="key">app_show_enterprise</field>
<field name="value">False</field>
</record>
<record id="app_show_share" model="ir.config_parameter">
<field name="key">app_show_share</field>
<field name="value">False</field>
</record>
<record id="app_show_poweredby" model="ir.config_parameter">
<field name="key">app_show_poweredby</field>
<field name="value">False</field>
</record>
<record id="app_documentation_url" model="ir.config_parameter">
<field name="key">app_documentation_url</field>
<field name="value">https://www.sunpop.cn/documentation/user/12.0/zh_CN/index.html</field>
</record>
<record id="app_documentation_dev_url" model="ir.config_parameter">
<field name="key">app_documentation_dev_url</field>
<field name="value">https://www.sunpop.cn/documentation/12.0/index.html</field>
</record>
<record id="app_support_url" model="ir.config_parameter">
<field name="key">app_support_url</field>
<field name="value">https://www.sunpop.cn/trial</field>
</record>
<record id="app_account_title" model="ir.config_parameter">
<field name="key">app_account_title</field>
<field name="value">My Online Account</field>
</record>
<record id="app_account_url" model="ir.config_parameter">
<field name="key">app_account_url</field>
<field name="value">https://www.sunpop.cn/my-account</field>
</record>
<!--测试环境from oca/web-->
<record id="app_ribbon_name" model="ir.config_parameter">
<field name="key">app_ribbon_name</field>
<field name="value"><![CDATA[Sunpop Test<br/>({db_name})]]></field>
</record>
<!-- Add ribbon color configuration parameter -->
<record id="app_ribbon_color" model="ir.config_parameter">
<field name="key">app_ribbon_color</field>
<field name="value">#f0f0f0</field>
</record>
<!-- Add ribbon background color configuration parameter -->
<record id="app_ribbon_background_color" model="ir.config_parameter">
<field name="key">app_ribbon_background_color</field>
<field name="value">rgba(255,0,0,.4)</field>
</record>
</data>
</openerp>

View File

@@ -1,72 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<data>
<record model="ir.module.module" id="base.module_web_studio">
<field name="website">https://www.sunpop.cn</field>
</record>
<record model="ir.module.module" id="base.module_timesheet_grid">
<field name="website">https://www.sunpop.cn</field>
</record>
<record model="ir.module.module" id="base.module_account_accountant">
<field name="website">https://www.sunpop.cn</field>
</record>
<record model="ir.module.module" id="base.module_helpdesk">
<field name="website">https://www.sunpop.cn</field>
</record>
<record model="ir.module.module" id="base.module_hr_appraisal">
<field name="website">https://www.sunpop.cn</field>
</record>
<record model="ir.module.module" id="base.module_marketing_automation">
<field name="website">https://www.sunpop.cn</field>
</record>
<record model="ir.module.module" id="base.module_mrp_plm">
<field name="website">https://www.sunpop.cn</field>
</record>
<record model="ir.module.module" id="base.module_quality_control">
<field name="website">https://www.sunpop.cn</field>
</record>
<record model="ir.module.module" id="base.module_sale_ebay">
<field name="website">https://www.sunpop.cn</field>
</record>
<record model="ir.module.module" id="base.module_project_forecast">
<field name="website">https://www.sunpop.cn</field>
</record>
<record model="ir.module.module" id="base.module_sale_subscription">
<field name="website">https://www.sunpop.cn</field>
</record>
<record model="ir.module.module" id="base.module_sign">
<field name="website">https://www.sunpop.cn</field>
</record>
<record model="ir.module.module" id="base.module_stock_barcode">
<field name="website">https://www.sunpop.cn</field>
</record>
<record model="ir.module.module" id="base.module_voip">
<field name="website">https://www.sunpop.cn</field>
</record>
<record model="ir.module.module" id="base.module_website_calendar">
<field name="website">https://www.sunpop.cn</field>
</record>
<record model="ir.module.module" id="base.module_mrp_workorder">
<field name="website">https://www.sunpop.cn</field>
</record>
<record model="ir.module.module" id="base.module_web_mobile">
<field name="website">https://www.sunpop.cn</field>
</record>
</data>
</odoo>

View File

@@ -1,19 +0,0 @@
<?xml version="1.0"?>
<openerp>
<data noupdate="0">
<record id="group_show_author_in_apps" model="res.groups">
<field name="name">Show Author in Apps Dashboard</field>
<field name="category_id" ref="base.module_category_hidden"/>
</record>
<record id="group_show_quick_upgrade" model="res.groups">
<field name="name">Show Quick Upgrade in Apps Dashboard</field>
<field name="category_id" ref="base.module_category_hidden"/>
</record>
<!--系统设置默认值-->
<!--1 默认显示快速升级-->
<record id="base.group_user" model="res.groups">
<field name="implied_ids"
eval="[(4, ref('app_odoo_customize.group_show_quick_upgrade'))]"/>
</record>
</data>
</openerp>

View File

@@ -58,7 +58,7 @@ class ResConfigSettings(models.TransientModel):
app_account_title = ir_config.get_param('app_account_title', default='My Online Account') app_account_title = ir_config.get_param('app_account_title', default='My Online Account')
app_account_url = ir_config.get_param('app_account_url', default='https://www.sunpop.cn/my-account/') app_account_url = ir_config.get_param('app_account_url', default='https://www.sunpop.cn/my-account/')
app_enterprise_url = ir_config.get_param('app_enterprise_url', default='https://www.sunpop.cn') app_enterprise_url = ir_config.get_param('app_enterprise_url', default='https://www.sunpop.cn')
app_ribbon_name = ir_config.get_param('app_ribbon_name', default='False') app_ribbon_name = ir_config.get_param('app_ribbon_name', default='*Sunpop.cn')
res.update( res.update(
app_system_name=app_system_name, app_system_name=app_system_name,
app_show_lang=app_show_lang, app_show_lang=app_show_lang,
@@ -103,7 +103,7 @@ class ResConfigSettings(models.TransientModel):
ir_config.set_param("app_account_title", self.app_account_title or "My Online Account") ir_config.set_param("app_account_title", self.app_account_title or "My Online Account")
ir_config.set_param("app_account_url", self.app_account_url or "https://www.sunpop.cn/my-account/") ir_config.set_param("app_account_url", self.app_account_url or "https://www.sunpop.cn/my-account/")
ir_config.set_param("app_enterprise_url", self.app_enterprise_url or "https://www.sunpop.cn") ir_config.set_param("app_enterprise_url", self.app_enterprise_url or "https://www.sunpop.cn")
ir_config.set_param("app_ribbon_name", self.app_ribbon_name or "False") ir_config.set_param("app_ribbon_name", self.app_ribbon_name or "*Sunpop.cn")
def set_module_url(self): def set_module_url(self):
sql = "UPDATE ir_module_module SET website = '%s' WHERE license like '%s' and website <> ''" % (self.app_enterprise_url, 'OEEL%') sql = "UPDATE ir_module_module SET website = '%s' WHERE license like '%s' and website <> ''" % (self.app_enterprise_url, 'OEEL%')

View File

@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
<record id="app_view_view_tree" model="ir.ui.view">
<field name="name">app.ir.ui.view tree</field>
<field name="model">ir.ui.view</field>
<field name="inherit_id" ref="base.view_view_tree"/>
<field name="arch" type="xml">
<field name="model" position="after">
<field name="priority"/>
<field name="mode"/>
</field>
</field>
</record>
</odoo>