diff --git a/app_base_superbar/views/ir_ui_view_views.xml b/app_base_superbar/views/ir_ui_view_views.xml index 60a39c76..549b7b76 100644 --- a/app_base_superbar/views/ir_ui_view_views.xml +++ b/app_base_superbar/views/ir_ui_view_views.xml @@ -8,7 +8,6 @@ - diff --git a/app_mrp_superbar/views/mrp_production_views.xml b/app_mrp_superbar/views/mrp_production_views.xml index bcc2a37b..f2521002 100644 --- a/app_mrp_superbar/views/mrp_production_views.xml +++ b/app_mrp_superbar/views/mrp_production_views.xml @@ -8,11 +8,11 @@ - + diff --git a/app_mrp_workcenter_zchart/__manifest__.py b/app_mrp_workcenter_zchart/__manifest__.py index e82f78d0..87b3653e 100644 --- a/app_mrp_workcenter_zchart/__manifest__.py +++ b/app_mrp_workcenter_zchart/__manifest__.py @@ -33,7 +33,7 @@ { 'name': "MRP Workcenter zChart Parent Child Hierarchy,工作中心分级", - 'version': '13.20.08.20', + 'version': '13.20.11.10', 'author': 'Sunpop.cn', 'category': 'Base', 'website': 'https://www.sunpop.cn', @@ -44,7 +44,6 @@ 'images': ['static/description/banner.png'], 'depends': [ 'mrp_workorder', - 'app_mrp_superbar', ], # 不要误装别的，避免冲突 'excludes': [ @@ -70,7 +69,6 @@ # 'security/ir.model.access.csv.csv', # 'data/*.xml', 'views/mrp_workcenter_views.xml', - 'views/mrp_workorder_views.xml', ], 'qweb': [ 'static/src/xml/*.xml', diff --git a/app_mrp_workcenter_zchart/views/mrp_workorder_views.xml b/app_mrp_workcenter_zchart/views/mrp_workorder_views.xml deleted file mode 100644 index 10173491..00000000 --- a/app_mrp_workcenter_zchart/views/mrp_workorder_views.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - app.mrp.production.work.order.select - mrp.workorder - - - - - - - - diff --git a/app_odoo_customize/__manifest__.py b/app_odoo_customize/__manifest__.py index 97750350..614eaf5d 100644 --- a/app_odoo_customize/__manifest__.py +++ b/app_odoo_customize/__manifest__.py @@ -23,7 +23,7 @@ { 'name': 'odoo 14,13 Customize OEM(Boost, Data reset)', - 'version': '13.20.11.06', + 'version': '13.20.11.10', 'author': 'Sunpop.cn', 'category': 'Productivity', 'website': 'https://www.sunpop.cn', @@ -35,7 +35,7 @@ customize my odoo. """, 'description': """ - + App Customize Odoo (Change Title,Language,Documentation,Quick Debug) ============ White label odoo. @@ -78,7 +78,8 @@ 35. Fixed for odoo 14. 36. Add refresh translate for multi module. 37. Easy noupdate manage for External Identifiers(xml_id) - + 38. Add Draggable Dialog enable. + This module can help to white label the Odoo. Also helpful for training and support for your odoo end-user. The user can get the help document just by one click. @@ -122,6 +123,7 @@ 35. 优化至odoo14适用 36. 可为多个模块强制更新翻译 37. noupdate字段的快速管理，主要针对 xml_id + 38. 对话框可拖拽 """, 'images': ['static/description/banner.gif'], 'depends': [ @@ -134,6 +136,8 @@ # 'web_mobile' ], 'data': [ + 'security/res_groups.xml', + 'security/ir.model.access.csv', 'views/app_odoo_customize_views.xml', 'views/app_theme_config_settings_views.xml', 'views/res_config_settings_views.xml', @@ -149,8 +153,6 @@ 'data/ir_module_module_data.xml', # 'data/digest_template_data.xml', 'data/res_company_data.xml', - 'security/res_groups.xml', - 'security/ir.model.access.csv', ], 'qweb': [ 'static/src/xml/*.xml', diff --git a/app_odoo_customize/static/description/index.html b/app_odoo_customize/static/description/index.html index 83513ebc..2b506db0 100644 --- a/app_odoo_customize/static/description/index.html +++ b/app_odoo_customize/static/description/index.html @@ -47,6 +47,9 @@

This is a Long Term Support Apps.

+

Update: v13.20.11.09

+

38. Add Draggable Dialog enable.

+

37. Easy noupdate manage for External Identifiers(xml_id).

Update: v13.20.08.29

36. Add odoo 14 support.

Update: v13.20.04.12

diff --git a/app_odoo_customize/static/src/js/dialog.js b/app_odoo_customize/static/src/js/dialog.js new file mode 100644 index 00000000..2cc20f82 --- /dev/null +++ b/app_odoo_customize/static/src/js/dialog.js @@ -0,0 +1,17 @@ +odoo.define('app_odoo_customize.dialog', function (require) { +'use strict'; + + var Dialog = require('web.Dialog'); + + Dialog.include({ + open: function () { + this._super.apply(this, arguments); + this._opened.then(function(){ + $(".modal-content").draggable({ + handle: ".modal-header" + }); + }); + return this; + }, + }); +}); diff --git a/app_odoo_customize/static/src/scss/dialog.scss b/app_odoo_customize/static/src/scss/dialog.scss new file mode 100644 index 00000000..ad828ffc --- /dev/null +++ b/app_odoo_customize/static/src/scss/dialog.scss @@ -0,0 +1,7 @@ +.modal { + .modal-content { + .modal-header.ui-draggable-handle { + cursor: move; + } + } +} \ No newline at end of file diff --git a/app_odoo_customize/views/app_odoo_customize_views.xml b/app_odoo_customize/views/app_odoo_customize_views.xml index ce0d018c..b1778dff 100644 --- a/app_odoo_customize/views/app_odoo_customize_views.xml +++ b/app_odoo_customize/views/app_odoo_customize_views.xml @@ -4,11 +4,13 @@ + + diff --git a/app_product_category_zchart/views/product_category_views.xml b/app_product_category_zchart/views/product_category_views.xml index 7c9c758a..49945950 100644 --- a/app_product_category_zchart/views/product_category_views.xml +++ b/app_product_category_zchart/views/product_category_views.xml @@ -17,7 +17,7 @@
- + diff --git a/app_web_enterprise/static/src/scss/app_style.scss b/app_web_enterprise/static/src/scss/app_style.scss index 5b8e271f..b20497b4 100644 --- a/app_web_enterprise/static/src/scss/app_style.scss +++ b/app_web_enterprise/static/src/scss/app_style.scss @@ -54,36 +54,32 @@ overflow: unset; } } -// Notebooks ,form_view,移动端优化 -.o_form_view { - .o_notebook { - > .nav.nav-tabs { - > .nav-item { - > .nav-link { - //border-left-width: 0!important; - background-color: #fafafa; - - &:hover, &:focus, &:active { - background-color: white; - } - - &.active { - border-top-width: 2px; - //border-left-width: 1px!important; - //border-right-width: 1px!important; - } - } - - &:first-child > .nav-link { - //border-left-width: 1px!important; - } - } - } +// Notebooks ,form_view,pc端优化 +.o_form_view .o_notebook > .o_notebook_headers > .nav.nav-tabs > .nav-item > .nav-link { + background-color: #f9f9f9; + &.active { + background-color: white; + border-top-width: 2px; + margin-top: -1px; + border-left-color: $o-enterprise-color; + border-left-width: 1px !important; + border-right-color: $o-enterprise-color; + border-right-width: 1px !important; + border-top-left-radius: 1px; + border-top-right-radius: 1px; } - - // 列表自定义显示调整 - .o_content > .o_list_view > .table-responsive > .table .o_optional_columns_dropdown_toggle { - margin-right: 16px; + &:hover, &:focus, &:active { + background-color: white; + } +} +// Notebooks ,form_view,移动端优化 +@media (max-width: 768px) { + .o_form_view .o_notebook > .o_notebook_headers > .nav.nav-tabs > .nav-item > .nav-link { + &.active { + margin-top: 0px; + margin-bottom: -1px; + padding-bottom: 0px; + } } }