diff --git a/app_base_chinese/__manifest__.py b/app_base_chinese/__manifest__.py index 0cb8799f..f1cc6fe6 100644 --- a/app_base_chinese/__manifest__.py +++ b/app_base_chinese/__manifest__.py @@ -18,7 +18,7 @@ { 'name': "App base chinese，中国化基本模块增强", - 'version': '13.19.12.24', + 'version': '13.20.01.18', 'author': 'Sunpop.cn', 'category': 'Base', 'website': 'https://www.sunpop.cn', @@ -42,21 +42,27 @@ 6. 修正产品类别的列表及m2o字段中不显示中文目录名的Bug 7. 修正仓库位置的列表及m2o字段中不显示中文目录名的Bug 8. 超级用户改时区为 中国 - 9. 时间格式年月日为 2019-12-30，时间为 22:10 - 11. todo:中文演示数据(只有demo模式才加载) - + 9. 时间格式年月日为 2019-12-30，时间为 22:10 + 10. 国家增加排序，中国排第一 + 11. 收款相关显示中国习惯 + 21. todo:中文演示数据(只有demo模式才加载) """, 'pre_init_hook': 'pre_init_hook', 'post_init_hook': 'post_init_hook', 'depends': [ 'app_base', + 'account', 'stock', ], 'images': ['static/description/banner.jpg'], 'data': [ 'views/res_partner_views.xml', 'views/res_currency_views.xml', + 'views/sale_order_views.xml', + 'views/account_move_views.xml', 'views/ir_default_views.xml', + 'views/templates.xml', + 'wizard/sale_make_invoice_advance_views.xml', 'data/ir_default_data.xml', 'data/ir_sequence_data.xml', 'data/base_data.xml', diff --git a/app_base_chinese/hooks.py b/app_base_chinese/hooks.py index a4fe4c6c..7b268bb0 100644 --- a/app_base_chinese/hooks.py +++ b/app_base_chinese/hooks.py @@ -44,6 +44,9 @@ def post_init_hook(cr, registry): ('id', '=', 2) ]) ids.write({'tz': "Asia/Shanghai"}) + # 中国排序第一 + ids = env.ref('base.cn') + ids.write({'sequence': 1}) except Exception as e: raise Warning(e) diff --git a/app_base_chinese/i18n/zh_CN.po b/app_base_chinese/i18n/zh_CN.po index d4e9e2e2..8f7abb75 100644 --- a/app_base_chinese/i18n/zh_CN.po +++ b/app_base_chinese/i18n/zh_CN.po @@ -1,49 +1,94 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * app_base +# * app_base_chinese # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 13.0+e-20191027\n" +"Project-Id-Version: Odoo Server 13.0+e\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-27 20:43+0000\n" -"PO-Revision-Date: 2019-10-27 20:43+0000\n" +"POT-Creation-Date: 2020-01-18 15:21+0000\n" +"PO-Revision-Date: 2020-01-18 23:22+0800\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: \n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: \n" +"X-Generator: Poedit 1.7.7\n" -#. module: app_base -#: model:ir.model.fields,help:app_base.field_res_partner__customer -#: model:ir.model.fields,help:app_base.field_res_users__customer -msgid "" -"Check this box if this contact is a customer. It can be selected in sales " -"orders." -msgstr "" +#. module: app_base_chinese +#: model:ir.model.fields,field_description:app_base_chinese.field_product_category__complete_name +msgid "Complete Name" +msgstr "完整名称" -#. module: app_base -#: model:ir.model.fields,help:app_base.field_res_partner__supplier -#: model:ir.model.fields,help:app_base.field_res_users__supplier -msgid "" -"Check this box if this contact is a vendor. It can be selected in purchase " -"orders." -msgstr "" - -#. module: app_base -#: model:ir.model,name:app_base.model_res_partner +#. module: app_base_chinese +#: model:ir.model,name:app_base_chinese.model_res_partner msgid "Contact" msgstr "联系人" -#. module: app_base -#: model:ir.model.fields,field_description:app_base.field_res_partner__customer -#: model:ir.model.fields,field_description:app_base.field_res_users__customer -msgid "Is a Customer" -msgstr "客户" +#. module: app_base_chinese +#: model_terms:ir.ui.view,arch_db:app_base_chinese.app_res_partner_kanban_view +msgid "Credit：" +msgstr "信用额:" -#. module: app_base -#: model:ir.model.fields,field_description:app_base.field_res_partner__supplier -#: model:ir.model.fields,field_description:app_base.field_res_users__supplier -msgid "Is a Vendor" -msgstr "供应商" +#. module: app_base_chinese +#: model:ir.model,name:app_base_chinese.model_res_currency +msgid "Currency" +msgstr "币种" + +#. module: app_base_chinese +#: model:ir.model.fields,help:app_base_chinese.field_res_currency__sequence +msgid "Determine the display order. Sort ascending." +msgstr "决定显示顺序，数字越小排序越前" + +#. module: app_base_chinese +#: model_terms:ir.ui.view,arch_db:app_base_chinese.app_view_sale_advance_payment_inv +msgid "FaPiao / Invoice Orders" +msgstr "创建收据/发票" + +#. module: app_base_chinese +#: model:ir.model.fields,field_description:app_base_chinese.field_stock_location__complete_name +msgid "Full Location Name" +msgstr "完整的位置名称" + +#. module: app_base_chinese +#: model:ir.model,name:app_base_chinese.model_stock_location +msgid "Inventory Locations" +msgstr "库存位置" + +#. module: app_base_chinese +#: model_terms:ir.ui.view,arch_db:app_base_chinese.app_view_order_form +msgid "Invoices/FaPiao" +msgstr "收据/发票" + +#. module: app_base_chinese +#: model_terms:ir.ui.view,arch_db:app_base_chinese.app_view_order_form +msgid "Make Collections" +msgstr "收款" + +#. module: app_base_chinese +#: model:ir.model.fields,field_description:app_base_chinese.field_res_partner__name +#: model:ir.model.fields,field_description:app_base_chinese.field_res_users__name +msgid "Name" +msgstr "名称" + +#. module: app_base_chinese +#: model_terms:ir.ui.view,arch_db:app_base_chinese.app_view_move_form +msgid "Post Entry" +msgstr "过帐" + +#. module: app_base_chinese +#: model:ir.model,name:app_base_chinese.model_product_category +msgid "Product Category" +msgstr "产品类别" + +#. module: app_base_chinese +#: model:ir.model.fields,field_description:app_base_chinese.field_res_currency__sequence +msgid "Sequence" +msgstr "单号规则" + +#. module: app_base_chinese +#: 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 "缩写" diff --git a/app_base_chinese/models/res_country.py b/app_base_chinese/models/res_country.py new file mode 100644 index 00000000..d0cf4869 --- /dev/null +++ b/app_base_chinese/models/res_country.py @@ -0,0 +1,11 @@ +# -*- coding: utf-8 -*- +# Part of Odoo. See LICENSE file for full copyright and licensing details. + +from odoo import fields, models + + +class Country(models.Model): + _inherit = 'res.country' + _order = 'sequence,name' + + sequence = fields.Integer('Sequence', help="Determine the display order", default=99) diff --git a/app_base_chinese/static/src/scss/app_style.scss b/app_base_chinese/static/src/scss/app_style.scss new file mode 100644 index 00000000..39bfb17d --- /dev/null +++ b/app_base_chinese/static/src/scss/app_style.scss @@ -0,0 +1,26 @@ +.o_form_view .o_address_format { + .o_address_country { + display: -webkit-inline-flex; + display: inline-flex; + width: 48%; + margin-right: 2%; + } +} +.o_form_view.o_form_editable .o_address_format { + div.o_address_state { + width: 50%; + margin-right: 0; + } + .o_address_city{ + width: 48%; + margin-right: 2%; + } + .o_address_city_id{ + width: 48%; + margin-right: 2%; + } + input.o_address_zip{ + width: 50%; + margin-right: 0; + } +} diff --git a/app_base_chinese/views/account_move_views.xml b/app_base_chinese/views/account_move_views.xml new file mode 100644 index 00000000..728d8a79 --- /dev/null +++ b/app_base_chinese/views/account_move_views.xml @@ -0,0 +1,19 @@ + + + + + + + app.account.move.form + account.move + + + + + Post Entry + + + + + + diff --git a/app_base_chinese/views/res_partner_views.xml b/app_base_chinese/views/res_partner_views.xml index 754ac3c7..6ff29d60 100644 --- a/app_base_chinese/views/res_partner_views.xml +++ b/app_base_chinese/views/res_partner_views.xml @@ -132,9 +132,6 @@ res.partner - - - @@ -151,9 +148,6 @@ -
  • - , -
  • Credit：
    • diff --git a/app_base_chinese/views/sale_order_views.xml b/app_base_chinese/views/sale_order_views.xml new file mode 100644 index 00000000..b67ab85c --- /dev/null +++ b/app_base_chinese/views/sale_order_views.xml @@ -0,0 +1,24 @@ + + + + + app.sale.order.form + sale.order + + + + + Make Collections + + + + Make Collections + + + + Invoices/FaPiao + + + + + \ No newline at end of file diff --git a/app_base_chinese/views/templates.xml b/app_base_chinese/views/templates.xml new file mode 100644 index 00000000..dd348f61 --- /dev/null +++ b/app_base_chinese/views/templates.xml @@ -0,0 +1,8 @@ + + + + diff --git a/app_base_chinese/wizard/sale_make_invoice_advance_views.xml b/app_base_chinese/wizard/sale_make_invoice_advance_views.xml new file mode 100644 index 00000000..1362a7aa --- /dev/null +++ b/app_base_chinese/wizard/sale_make_invoice_advance_views.xml @@ -0,0 +1,21 @@ + + + + FaPiao / Invoice Orders + + + + app.account.move.form + sale.advance.payment.inv + + + + FaPiao / Invoice Orders + + + + + + Create FaPiao / Invoice + + diff --git a/app_hr_ztree/views/hr_views.xml b/app_hr_ztree/views/hr_views.xml index 5bafdacf..39d13f8f 100644 --- a/app_hr_ztree/views/hr_views.xml +++ b/app_hr_ztree/views/hr_views.xml @@ -9,7 +9,7 @@ ztree_select - {'ztree_parent_key': 'parent_id','ztree_expend_level': '2', 'ztree_name_field': 'name'} + {'ztree_parent_key': 'parent_id','ztree_expend_level': '1', 'ztree_name_field': 'name'}     @@ -21,7 +21,7 @@ ztree_select - {'ztree_parent_key': 'parent_id','ztree_expend_level': '2', 'ztree_name_field': 'name'} + {'ztree_parent_key': 'parent_id','ztree_expend_level': '1', 'ztree_name_field': 'name'}     diff --git a/app_mrp_workcenter_chart/__init__.py b/app_mrp_workcenter_chart/__init__.py new file mode 100644 index 00000000..a1125039 --- /dev/null +++ b/app_mrp_workcenter_chart/__init__.py @@ -0,0 +1,6 @@ +# -*- coding: utf-8 -*- + +from . import models +from .hooks import pre_init_hook +from .hooks import post_init_hook +from .hooks import uninstall_hook \ No newline at end of file diff --git a/app_mrp_workcenter_chart/__manifest__.py b/app_mrp_workcenter_chart/__manifest__.py new file mode 100644 index 00000000..77fca457 --- /dev/null +++ b/app_mrp_workcenter_chart/__manifest__.py @@ -0,0 +1,84 @@ +# -*- coding: utf-8 -*- + +# Created on 2019-05-26 +# author: 广州尚鹏，https://www.sunpop.cn +# email: 300883@qq.com +# resource of Sunpop +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). + +# Odoo12在线用户手册（长期更新） +# https://www.sunpop.cn/documentation/user/12.0/zh_CN/index.html + +# Odoo12在线开发者手册（长期更新） +# https://www.sunpop.cn/documentation/12.0/index.html + +# Odoo10在线中文用户手册（长期更新） +# https://www.sunpop.cn/documentation/user/10.0/zh_CN/index.html + +# Odoo10离线中文用户手册下载 +# https://www.sunpop.cn/odoo10_user_manual_document_offline/ +# Odoo10离线开发手册下载-含python教程，jquery参考，Jinja2模板，PostgresSQL参考（odoo开发必备） +# https://www.sunpop.cn/odoo10_developer_document_offline/ + +############################################################################## +# Copyright (C) 2009-TODAY Sunpop.cn Ltd. https://www.sunpop.cn +# Author: Ivan Deng，300883@qq.com +# You can modify it under the terms of the GNU LESSER +# GENERAL PUBLIC LICENSE (LGPL v3), Version 3. +# See . +# +# It is forbidden to publish, distribute, sublicense, or sell copies +# of the Software or modified copies of the Software. +############################################################################## + +{ + 'name': "MRP Workcenter Parent Child Hierarchy,工作中心分级", + 'version': '13.20.01.06', + 'author': 'Sunpop.cn', + 'category': 'Base', + 'website': 'https://www.sunpop.cn', + 'license': 'LGPL-3', + 'sequence': 2, + 'price': 0.00, + 'currency': 'EUR', + 'images': ['static/description/banner.png'], + 'depends': [ + 'mrp_workorder', + 'app_mrp_superbar', + ], + 'summary': """ + Odoo App of Sunpop.cn + """, + 'description': """ + Support Odoo 12, 11, Enterprise and Community Edition + 1. D + 2. + 11. Multi-language Support. + 12. Multi-Company Support. + ========== + 1. + 2. + 11. 多语言支持 + 12. 多公司支持 + """, + 'data': [ + # 'security/*.xml', + # 'security/ir.model.access.csv.csv', + # 'data/*.xml', + 'views/mrp_workcenter_views.xml', + 'views/mrp_workorder_views.xml', + ], + 'qweb': [ + 'static/src/xml/*.xml', + ], + 'demo': [], + 'test': [], + 'css': [], + 'js': [], + # 'pre_init_hook': 'pre_init_hook', + # 'post_init_hook': 'post_init_hook', + # 'uninstall_hook': 'uninstall_hook', + 'installable': True, + 'application': True, + 'auto_install': False, +} diff --git a/app_mrp_workcenter_chart/hooks.py b/app_mrp_workcenter_chart/hooks.py new file mode 100644 index 00000000..3ba52cbf --- /dev/null +++ b/app_mrp_workcenter_chart/hooks.py @@ -0,0 +1,32 @@ +# -*- coding: utf-8 -*- + +# Created on 2018-10-12 +# author: 广州尚鹏，https://www.sunpop.cn +# email: 300883@qq.com +# resource of Sunpop +# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl). + +# Odoo在线中文用户手册（长期更新） +# https://www.sunpop.cn/documentation/user/10.0/zh_CN/index.html + +# Odoo10离线中文用户手册下载 +# https://www.sunpop.cn/odoo10_user_manual_document_offline/ +# Odoo10离线开发手册下载-含python教程，jquery参考，Jinja2模板，PostgresSQL参考（odoo开发必备） +# https://www.sunpop.cn/odoo10_developer_document_offline/ +# description: + +from odoo import api, SUPERUSER_ID, _ + + +def pre_init_hook(cr): + pass + # cr.execute("") + +def post_init_hook(cr, registry): + pass + # cr.execute("") + +def uninstall_hook(cr, registry): + pass + # cr.execute("") + diff --git a/app_mrp_workcenter_chart/i18n/zh_CN.po b/app_mrp_workcenter_chart/i18n/zh_CN.po new file mode 100644 index 00000000..0f9c1a96 --- /dev/null +++ b/app_mrp_workcenter_chart/i18n/zh_CN.po @@ -0,0 +1,88 @@ +# Translation of Odoo Server. +# This file contains the translation of the following modules: +# * app_mrp_workcenter_chart +# +msgid "" +msgstr "" +"Project-Id-Version: Odoo Server 12.0+e-20190512\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2019-07-28 18:19+0000\n" +"PO-Revision-Date: 2019-07-28 18:19+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" + +#. module: app_mrp_workcenter_chart +#: model:ir.model.fields,field_description:app_mrp_workcenter_chart.field_mrp_workcenter__child_ids +msgid "Child WCs" +msgstr "下级工作中心" + +#. module: app_mrp_workcenter_chart +#: model_terms:ir.ui.view,arch_db:app_mrp_workcenter_chart.app_mrp_workcenter_view +msgid "Hierarchy Chart" +msgstr "工作中心层级" + +#. module: app_mrp_workcenter_chart +#: model:ir.model.fields,field_description:app_mrp_workcenter_chart.field_mrp_workcenter__image +msgid "Image" +msgstr "图像" + +#. module: app_mrp_workcenter_chart +#: model:ir.model.fields,field_description:app_mrp_workcenter_chart.field_mrp_workcenter__child_all_count +msgid "Indirect Surbordinates Count" +msgstr "非直属下级数量" + +#. module: app_mrp_workcenter_chart +#: model:ir.model.fields,field_description:app_mrp_workcenter_chart.field_mrp_workcenter__image_medium +msgid "Medium-sized image" +msgstr "中等尺寸图像" + +#. module: app_mrp_workcenter_chart +#: model:ir.model.fields,help:app_mrp_workcenter_chart.field_mrp_workcenter__image_medium +msgid "Medium-sized image of this Category. It is automatically resized as a 128x128px image, with aspect ratio preserved. Use this field in form views or some kanban views." +msgstr "" + +#. module: app_mrp_workcenter_chart +#: model:ir.model.fields,field_description:app_mrp_workcenter_chart.field_mrp_workcenter__parent_path +msgid "Parent Path" +msgstr "父级路径" + +#. module: app_mrp_workcenter_chart +#: model:ir.model.fields,field_description:app_mrp_workcenter_chart.field_mrp_workcenter__parent_id +#: model_terms:ir.ui.view,arch_db:app_mrp_workcenter_chart.app_view_mrp_workcenter_search +msgid "Parent WC" +msgstr "上级工作中心" + +#. module: app_mrp_workcenter_chart +#: model_terms:ir.ui.view,arch_db:app_mrp_workcenter_chart.app_mrp_workcenter_view +msgid "Please get widget from https://apps.odoo.com/apps/modules/12.0/app_web_chart_hierarchy/" +msgstr "" + +#. module: app_mrp_workcenter_chart +#: model:ir.model.fields,field_description:app_mrp_workcenter_chart.field_mrp_workcenter__image_small +msgid "Small-sized image" +msgstr "小尺寸图像" + +#. module: app_mrp_workcenter_chart +#: model:ir.model.fields,help:app_mrp_workcenter_chart.field_mrp_workcenter__image_small +msgid "Small-sized image of this Category. It is automatically resized as a 64x64px image, with aspect ratio preserved. Use this field anywhere a small image is required." +msgstr "" + +#. module: app_mrp_workcenter_chart +#: model:ir.model.fields,help:app_mrp_workcenter_chart.field_mrp_workcenter__image +msgid "This field holds the image used as avatar for this category, limited to 1024x1024px" +msgstr "" + +#. module: app_mrp_workcenter_chart +#: model:ir.model,name:app_mrp_workcenter_chart.model_mrp_workcenter +msgid "Work Center" +msgstr "工作中心" + +#. module: app_mrp_workcenter_chart +#: model_terms:ir.ui.view,arch_db:app_mrp_workcenter_chart.app_mrp_workcenter_view +msgid "Work Center Name" +msgstr "工作中心名称" + diff --git a/app_mrp_workcenter_chart/models/__init__.py b/app_mrp_workcenter_chart/models/__init__.py new file mode 100644 index 00000000..65c5c045 --- /dev/null +++ b/app_mrp_workcenter_chart/models/__init__.py @@ -0,0 +1,3 @@ +# -*- coding: utf-8 -*- + +from . import mrp_workcenter \ No newline at end of file diff --git a/app_mrp_workcenter_chart/models/mrp_workcenter.py b/app_mrp_workcenter_chart/models/mrp_workcenter.py new file mode 100644 index 00000000..72e6b08b --- /dev/null +++ b/app_mrp_workcenter_chart/models/mrp_workcenter.py @@ -0,0 +1,31 @@ +# -*- coding: utf-8 -*- + +from odoo import api, fields, models, tools, _ + +import logging + +_logger = logging.getLogger(__name__) + + +class MrpWorkCenter(models.Model): + _name = 'mrp.workcenter' + _inherit = ['mrp.workcenter', 'image.mixin'] + + # 建立层级关系 + _parent_name = "parent_id" + _parent_store = True + _parent_order = 'code' + + parent_id = fields.Many2one('mrp.workcenter', 'Parent WC', index=True, ondelete='cascade') + parent_path = fields.Char(index=True) + child_ids = fields.One2many('mrp.workcenter', 'parent_id', 'Child WCs') + child_all_count = fields.Integer( + 'Indirect Surbordinates Count', + compute='_compute_child_all_count', store=False) + parent_path = fields.Char(index=True) + + @api.depends('child_ids.child_all_count') + def _compute_child_all_count(self): + for rec in self: + rec.child_all_count = len(rec.child_ids) + sum(child.child_all_count for child in rec.child_ids) + diff --git a/app_mrp_workcenter_chart/report/__init__.py b/app_mrp_workcenter_chart/report/__init__.py new file mode 100644 index 00000000..633f8661 --- /dev/null +++ b/app_mrp_workcenter_chart/report/__init__.py @@ -0,0 +1,2 @@ +# -*- coding: utf-8 -*- + diff --git a/app_mrp_workcenter_chart/security/app_security.xml b/app_mrp_workcenter_chart/security/app_security.xml new file mode 100644 index 00000000..a4b85605 --- /dev/null +++ b/app_mrp_workcenter_chart/security/app_security.xml @@ -0,0 +1,51 @@ + + + + + + acc_module_user + + + + + + + + + + App... + Helps you manage your ... + 8 + + + + + App User + + + The user will be able to ... + + + + + App Admin + + + The user will be able to config ... + + + + + + + + + + Users are allowed to access their own m/// + + ['|', ('partner_id', 'in', [user.partner_id.id]), ('user_id.id', '=', user.id)] + + + + + diff --git a/app_mrp_workcenter_chart/security/ir.model.access.csv b/app_mrp_workcenter_chart/security/ir.model.access.csv new file mode 100644 index 00000000..58262d44 --- /dev/null +++ b/app_mrp_workcenter_chart/security/ir.model.access.csv @@ -0,0 +1 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink \ No newline at end of file diff --git a/app_mrp_workcenter_chart/static/description/banner.png b/app_mrp_workcenter_chart/static/description/banner.png new file mode 100644 index 00000000..ab99881e Binary files /dev/null and b/app_mrp_workcenter_chart/static/description/banner.png differ diff --git a/app_mrp_workcenter_chart/static/description/icon.png b/app_mrp_workcenter_chart/static/description/icon.png new file mode 100644 index 00000000..3669f20f Binary files /dev/null and b/app_mrp_workcenter_chart/static/description/icon.png differ diff --git a/app_mrp_workcenter_chart/static/description/index.html b/app_mrp_workcenter_chart/static/description/index.html new file mode 100644 index 00000000..3c17b7bb --- /dev/null +++ b/app_mrp_workcenter_chart/static/description/index.html @@ -0,0 +1,73 @@ +
    +
    +
    +

    +

    +
    +

    Lastest update: v12.19.04.28

    +
    + +
    +
    +
    + Key features: +
      +
    • + + Put key function here. +
      • +
    +
    +
    +
    +
    +
    +
    + +
    +
    +

    So Easy to navigator and search any data.

    +

    +
    + +
    +
    +
    + +
    +
    +
    +

    Technical Help & Support

    +
    +
    +
    +

    + For any type of technical help & support requests, Feel free to contact us

    + + guohuadeng@hotmail.com +

    + Via QQ: 300883 (App user would not get QQ or any other IM support. Only for odoo project customize.)

    + + 300883@qq.com +
    +
    +

    + Visit our website for more support.

    + + https://www.sunpop.cn +
    +
    +
    +
    +

    More Powerful addons, Make your odoo very easy to use, easy customize: + Supop.cn Odoo Addons +

    +
    +
    + diff --git a/app_mrp_workcenter_chart/static/img/icon_sunpop.png b/app_mrp_workcenter_chart/static/img/icon_sunpop.png new file mode 100644 index 00000000..aa490954 Binary files /dev/null and b/app_mrp_workcenter_chart/static/img/icon_sunpop.png differ diff --git a/app_mrp_workcenter_chart/static/img/logo_sunpop.png b/app_mrp_workcenter_chart/static/img/logo_sunpop.png new file mode 100644 index 00000000..bc32c24e Binary files /dev/null and b/app_mrp_workcenter_chart/static/img/logo_sunpop.png differ diff --git a/app_mrp_workcenter_chart/views/mrp_workcenter_views.xml b/app_mrp_workcenter_chart/views/mrp_workcenter_views.xml new file mode 100644 index 00000000..43d1c058 --- /dev/null +++ b/app_mrp_workcenter_chart/views/mrp_workcenter_views.xml @@ -0,0 +1,116 @@ + + + + + mrp.workcenter.form + mrp.workcenter + + + + + + + + + + + + + + +
    +
    + +
    +
    + + +
    +
    +

    Hierarchy Chart

    + +
    +
    +     + + + + + + +     +     + + + mrp.workcenter.tree + mrp.workcenter + + + + + + + + + + + app.mrp.workcenter.kanban1 + mrp.workcenter + + + + parent_id + + + + + + app.mrp.workcenter.kanban2 + mrp.workcenter + + + + + + + + [] + + + + + + + mrp.workcenter.search + mrp.workcenter + + + + + + + + + + + + + + + + + + {'search_default_group_by_parent_id':1} + +     diff --git a/app_mrp_workcenter_chart/views/mrp_workorder_views.xml b/app_mrp_workcenter_chart/views/mrp_workorder_views.xml new file mode 100644 index 00000000..c91e8d3e --- /dev/null +++ b/app_mrp_workcenter_chart/views/mrp_workorder_views.xml @@ -0,0 +1,14 @@ + + + + + app.mrp.production.work.order.select + mrp.workorder + + + + + + + + diff --git a/app_odoo_customize/__manifest__.py b/app_odoo_customize/__manifest__.py index c5ad33a2..56c5d92a 100644 --- a/app_odoo_customize/__manifest__.py +++ b/app_odoo_customize/__manifest__.py @@ -23,7 +23,7 @@ { 'name': 'Odoo Customize(Boost,Debranding, My Odoo)', - 'version': '13.19.12.09', + 'version': '13.20.01.06', 'author': 'Sunpop.cn', 'category': 'Productivity', 'website': 'https://www.sunpop.cn', @@ -68,6 +68,7 @@ 25. Add remove expense data 26. Add multi uninstall modules 27. Add odoo boost modules link. + 28. Easy Menu manager. This module can help to white label the Odoo. Also helpful for training and support for your odoo end-user. @@ -89,6 +90,7 @@ 'views/res_config_settings_views.xml', 'views/ir_model_views.xml', 'views/ir_views.xml', + 'views/ir_ui_menu_views.xml', # data 'data/ir_config_parameter.xml', 'data/ir_module_module.xml', @@ -108,5 +110,5 @@ # 'post_init_hook': 'post_init_hook', 'installable': True, 'application': True, - 'auto_install': False, + 'auto_install': True, } diff --git a/app_odoo_customize/models/res_config_settings.py b/app_odoo_customize/models/res_config_settings.py index 663e25bc..81b8aed3 100644 --- a/app_odoo_customize/models/res_config_settings.py +++ b/app_odoo_customize/models/res_config_settings.py @@ -367,6 +367,7 @@ class ResConfigSettings(models.TransientModel): def remove_account(self): to_removes = [ # 清除财务会计单据 + ['payment.transaction', ], ['account.voucher.line', ], ['account.voucher', ], ['account.bank.statement.line', ], @@ -517,6 +518,7 @@ class ResConfigSettings(models.TransientModel): ['blog.tag', ], ['blog.post', ], ['blog.blog', ], + ['product.wishlist', ], ['website.published.multi.mixin', ], ['website.published.mixin', ], ['website.multi.mixin', ], @@ -524,6 +526,7 @@ class ResConfigSettings(models.TransientModel): ['website.seo.metadata', ], ['website.page', ], ['website.menu', ], + ['website.visitor', ], ['website', ], ] try: diff --git a/app_odoo_customize/static/description/banner.png b/app_odoo_customize/static/description/banner.png index 7ed3ccec..c86b3717 100644 Binary files a/app_odoo_customize/static/description/banner.png and b/app_odoo_customize/static/description/banner.png differ diff --git a/app_odoo_customize/static/description/banner1.png b/app_odoo_customize/static/description/banner1.png new file mode 100644 index 00000000..7ed3ccec Binary files /dev/null and b/app_odoo_customize/static/description/banner1.png differ diff --git a/app_odoo_customize/views/ir_ui_menu_views.xml b/app_odoo_customize/views/ir_ui_menu_views.xml new file mode 100644 index 00000000..fb9ebfcb --- /dev/null +++ b/app_odoo_customize/views/ir_ui_menu_views.xml @@ -0,0 +1,22 @@ + + + + + + + + + app.ir.ui.menu.search + ir.ui.menu + + + + + + + + + {'ir.ui.menu.full_list': True, 'search_default_top_menu': 1} + + + \ No newline at end of file diff --git a/app_product_superbar/__manifest__.py b/app_product_superbar/__manifest__.py index 71467ffa..b19cc2fe 100644 --- a/app_product_superbar/__manifest__.py +++ b/app_product_superbar/__manifest__.py @@ -17,7 +17,7 @@ { 'name': "App product browse by category navigator", - 'version': '13.19.09.27', + 'version': '13.19.12.31', 'author': 'Sunpop.cn', 'category': 'Base', 'website': 'https://www.sunpop.cn', diff --git a/app_product_superbar/views/product_views.xml b/app_product_superbar/views/product_views.xml index 94bdeff0..e1455783 100644 --- a/app_product_superbar/views/product_views.xml +++ b/app_product_superbar/views/product_views.xml @@ -8,9 +8,7 @@ - - diff --git a/app_product_ztree/views/product_views.xml b/app_product_ztree/views/product_views.xml index 2119750d..3d80453f 100644 --- a/app_product_ztree/views/product_views.xml +++ b/app_product_ztree/views/product_views.xml @@ -9,7 +9,7 @@ ztree_select - {'ztree_parent_key': 'parent_id','ztree_expend_level': '2', 'ztree_name_field': 'name', 'order': 'name' } + {'ztree_parent_key': 'parent_id','ztree_expend_level': '1', 'ztree_name_field': 'name', 'order': 'name' } @@ -21,7 +21,7 @@ ztree_select - {'ztree_parent_key': 'parent_id','ztree_expend_level': '2', 'order': 'name' } + {'ztree_parent_key': 'parent_id','ztree_expend_level': '1', 'order': 'name' }     diff --git a/app_stock_ztree/views/stock_views.xml b/app_stock_ztree/views/stock_views.xml index 643700cf..32fa849c 100644 --- a/app_stock_ztree/views/stock_views.xml +++ b/app_stock_ztree/views/stock_views.xml @@ -9,7 +9,7 @@ ztree_select - {'ztree_parent_key': 'location_id','ztree_expend_level': '2', 'ztree_name_field': 'name'} + {'ztree_parent_key': 'location_id','ztree_expend_level': '1', 'ztree_name_field': 'name'} diff --git a/app_web_enterprise/static/src/scss/app_style.scss b/app_web_enterprise/static/src/scss/app_style.scss index 389d46cf..855f9c59 100644 --- a/app_web_enterprise/static/src/scss/app_style.scss +++ b/app_web_enterprise/static/src/scss/app_style.scss @@ -60,5 +60,10 @@ .o_content > .o_list_view > .table-responsive > .table .o_optional_columns_dropdown_toggle { margin-right: 16px; } +} -} \ No newline at end of file +// Kanban + +.o_kanban_view.o_kanban_grouped .o_kanban_record { + margin-bottom: 4px; +} diff --git a/app_web_fullwidth/views/template_view.xml b/app_web_fullwidth/views/template_view.xml index 7a21f654..9dcdb9af 100644 --- a/app_web_fullwidth/views/template_view.xml +++ b/app_web_fullwidth/views/template_view.xml @@ -1,10 +1,10 @@ - - - + + + \ No newline at end of file diff --git a/web_fontawesome/__manifest__.py b/web_fontawesome/__manifest__.py index 4f984075..d3e53f84 100644 --- a/web_fontawesome/__manifest__.py +++ b/web_fontawesome/__manifest__.py @@ -42,5 +42,5 @@ 'templates/assets.xml', ], 'installable': True, - 'auto_install': True, + 'auto_install': False, }