From fdaaef7e7bdae6f4996e6d7419d4f4d453013043 Mon Sep 17 00:00:00 2001
From: Ivan Office <guohuadeng@hotmail.com>
Date: Tue, 20 Aug 2024 03:10:29 +0800
Subject: [PATCH] update

---
 README.md                                     |  4 +-
 app_common/__manifest__.py                    |  2 +-
 app_common/static/description/index.html      |  2 +-
 app_odoo_customize/__manifest__.py            |  2 +-
 .../static/description/index_cn.html          |  4 +-
 app_odoo_customize/static/src/js/ribbon.js    |  2 +-
 app_web_enterprise/__manifest__.py            | 10 +--
 .../tracking_value/tracking_value.xml         | 11 +++
 .../static/src/scss/app_style_before.scss     | 81 ++++++++++++++++++-
 .../static/src/scss/navbar_before.scss        | 12 ---
 .../static/src/webclient/navbar.xml           | 35 ++++----
 .../static/src/xml/res_config_edition.xml     |  4 +-
 12 files changed, 123 insertions(+), 46 deletions(-)
 create mode 100644 app_web_enterprise/static/src/components/tracking_value/tracking_value.xml
 delete mode 100644 app_web_enterprise/static/src/scss/navbar_before.scss

diff --git a/README.md b/README.md
index 784f8d58..4dc4780a 100644
--- a/README.md
+++ b/README.md
@@ -133,7 +133,7 @@ App MRP Bom Product Multi Batch Add
     For Odoo17. Please get from the follow github. Done for 85%.
     https://github.com/guohuadeng/app-odoo/tree/17.0
     White label odoo. UI and Development Enhance.
-    Support Odoo 17,16,15,14,13,12,11,10,9.
+    Support Odoo 18,17,16,15,14,13,12,11,10,9.
     You can config odoo, make it look like your own platform.
     ============
     1. Deletes Odoo label in footer
@@ -189,7 +189,7 @@ App MRP Bom Product Multi Batch Add
     The user can get the help document just by one click.
     ## 在符合odoo开源协议的前提下，自定义你的odoo系统
     可完全自行设置下列选项，将 odoo 整合进自有软件产品
-    支持odoo 17,16,15,14,13,12, 11, 10, 9 版本，社区版企业版通用
+    支持Odoo 18,17,16,15,14,13,12, 11, 10, 9 版本，社区版企业版通用
     ============
     1. 删除菜单导航页脚的 Odoo 标签
     2. 将弹出窗口中 "Odoo" 设置为自定义名称
diff --git a/app_common/__manifest__.py b/app_common/__manifest__.py
index 8424722b..91c7face 100644
--- a/app_common/__manifest__.py
+++ b/app_common/__manifest__.py
@@ -67,7 +67,7 @@
     9. Customize .rng file
     10. Misc like get distance between two points
     11. Multi-language Support. Multi-Company Support.
-    12. Support Odoo 17,16,15,14,13,12, Enterprise and Community and odoo.sh Edition.
+    12. Support Odoo 18,17,16,15,14,13,12, Enterprise and Community and odoo.sh Edition.
     13. Full Open Source.
     ==========
     1. 
diff --git a/app_common/static/description/index.html b/app_common/static/description/index.html
index ff947c17..54993f7a 100644
--- a/app_common/static/description/index.html
+++ b/app_common/static/description/index.html
@@ -58,7 +58,7 @@
                             </li>
                             <li>
                                 <i class="fa fa-check-square-o text-primary"></i>
-                                12. Support Odoo 17,16,15,14,13,12, Enterprise and Community and odoo.sh Edition.
+                                12. Support Odoo 18,17,16,15,14,13,12, Enterprise and Community and odoo.sh Edition.
                             </li>
                             <li>
                                 <i class="fa fa-check-square-o text-primary"></i>
diff --git a/app_odoo_customize/__manifest__.py b/app_odoo_customize/__manifest__.py
index c278b2d2..75d53baa 100644
--- a/app_odoo_customize/__manifest__.py
+++ b/app_odoo_customize/__manifest__.py
@@ -88,7 +88,7 @@
     App Customize Odoo (Change Title,Language,Documentation,Quick Debug)
     ============
     White label odoo.
-    Support Odoo 17,16,15,14,13,12,11,10,9.
+    Support Odoo 18,17,16,15,14,13,12,11,10,9.
     You can config odoo, make it look like your own platform.
     1. Deletes Odoo label in footer
     2. Replaces "Odoo" in Windows title
diff --git a/app_odoo_customize/static/description/index_cn.html b/app_odoo_customize/static/description/index_cn.html
index 1149d38b..779aad1b 100644
--- a/app_odoo_customize/static/description/index_cn.html
+++ b/app_odoo_customize/static/description/index_cn.html
@@ -115,7 +115,7 @@
                         Addons</a>
                 </p>
                 <br>
-                <h3>支持odoo 17,16,15,14,13,12, 11, 10, 9 版本，社区版企业版通用</h3>
+                <h3>支持Odoo 18,17,16,15,14,13,12, 11, 10, 9 版本，社区版企业版通用</h3>
                 <ul class="list-group">
                     <li class='list-group-item'>1. 删除菜单导航页脚的 Odoo 标签</li>
                     <li class='list-group-item'>2. 将弹出窗口中 "Odoo" 设置为自定义名称</li>
@@ -380,7 +380,7 @@
     <div class="oe_demo" style=" margin: 30px auto 0; padding: 0 15px 0 0; border:none; width: 96%;">
         <p>This moduld allows user to quickly customize and debranding Odoo. Quick debug, Language Switcher,
             Online Documentation Access,Quick Data Clear. </p>
-        <p class="mb16">Support Odoo 17,16,15,14,13, 12, 11, 10, 9. Including community and enterprise version. </p>
+        <p class="mb16">Support Odoo 18,17,16,15,14,13, 12, 11, 10, 9. Including community and enterprise version. </p>
     </div>
 </section>
 
diff --git a/app_odoo_customize/static/src/js/ribbon.js b/app_odoo_customize/static/src/js/ribbon.js
index f6530e97..5d520714 100644
--- a/app_odoo_customize/static/src/js/ribbon.js
+++ b/app_odoo_customize/static/src/js/ribbon.js
@@ -51,7 +51,7 @@ export class WebEnvironmentRibbon extends Component {
                 // Ribbon name
                 if (ribbon_data.name && ribbon_data.name !== "False") {
                     ribbon.classList.remove('o_hidden');
-                    ribbon.html(ribbon_data.name);
+                    ribbon.innerHTML = ribbon_data.name;
                 }
                 // Ribbon color
                 if (ribbon_data.color && self.validStrColour(ribbon_data.color)) {
diff --git a/app_web_enterprise/__manifest__.py b/app_web_enterprise/__manifest__.py
index 16b74118..21b0b678 100644
--- a/app_web_enterprise/__manifest__.py
+++ b/app_web_enterprise/__manifest__.py
@@ -18,7 +18,7 @@
 
 {
     'name': "odoo18 Enterprise enhance Pack,企业版界面及操作增强",
-    'version': '24.08.19',
+    'version': '24.08.20',
     'author': 'odooai.cn',
     'category': 'Extra tools',
     'website': 'https://www.odooai.cn',
@@ -48,13 +48,13 @@
     6. Add grid line to Account Reports. Easy to view Data.
     为财务报表增加行列分隔线，易于看数据及对账。
     11. Multi-language Support. Multi-Company Support.
-    12. Support Odoo 17,16,15,14,13,12, Enterprise and Community and odoo.sh Edition.
+    12. Support Odoo 18,17,16,15,14,13,12, Enterprise and Community and odoo.sh Edition.
     13. Full Open Source.
     ==========
     1.
     2.
     11. 多语言支持，多公司支持
-    12. Odoo 17,16,15,14,13,12, 企业版，社区版，在线SaaS.sh版，等全版本支持
+    12. Odoo 18,17,16,15,14,13,12, 企业版，社区版，在线SaaS.sh版，等全版本支持
     13. 代码完全开源
     """,
     'price': 68.00,
@@ -77,8 +77,8 @@
             ('before', 'web/static/src/views/**/*', 'app_web_enterprise/static/src/scss/app_style_before.scss'),
             ('after', 'web/static/src/views/**/*', 'app_web_enterprise/static/src/scss/app_style_after.scss'),
             'app_web_enterprise/static/src/webclient/**/*.xml',
-            # 'app_web_enterprise/static/src/xml/**/*.xml',
-            # 'app_web_enterprise/static/src/xml/base.xml',
+            'app_web_enterprise/static/src/xml/res_config_edition.xml',
+            # 'app_web_enterprise/static/src/xml/form.xml',
         ],
         # 这里是改样式，要 after处理
         'web.assets_common': [
diff --git a/app_web_enterprise/static/src/components/tracking_value/tracking_value.xml b/app_web_enterprise/static/src/components/tracking_value/tracking_value.xml
new file mode 100644
index 00000000..814d99b7
--- /dev/null
+++ b/app_web_enterprise/static/src/components/tracking_value/tracking_value.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<templates xml:space="preserve">
+<!--    <t t-name="mail.TrackingValue" t-inherit="mail.TrackingValue" t-inherit_mode="extension" owl="1">-->
+<!--        <xpath expr="//span[hasclass('o_TrackingValue_fieldName')]" position="replace">-->
+<!--            <span class="o_TrackingValue_fieldName ms-1 fw-bold text-muted" t-esc="trackingValue.formattedChangedField + ':'"/>-->
+<!--        </xpath>-->
+<!--        <xpath expr="//span[@t-esc='trackingValue.oldValue.formattedValueOrNone']" position="before">-->
+<!--            <xpath expr="//span[hasclass('o_TrackingValue_fieldName')]" position="move"/>-->
+<!--        </xpath>-->
+<!--    </t>-->
+</templates>
diff --git a/app_web_enterprise/static/src/scss/app_style_before.scss b/app_web_enterprise/static/src/scss/app_style_before.scss
index ba68f580..8892c08c 100644
--- a/app_web_enterprise/static/src/scss/app_style_before.scss
+++ b/app_web_enterprise/static/src/scss/app_style_before.scss
@@ -1,17 +1,23 @@
-// 编辑模式默认 input下方border 有颜色
+// 编辑模式默认 input下方border 有颜色。必填的深色
 .o_form_view {
   .o_form_view_container {
     &:not(.o_field_highlight) .o_field_widget:not(.o_field_invalid):not(.o_field_highlight) .o_input:not(:hover):not(:focus) {
       --o-input-border-color: #{map-get($grays, '200')};
     }
+    &:not(.o_field_highlight) .o_required_modifier.o_field_widget:not(.o_field_invalid):not(.o_field_highlight) .o_input:not(:hover):not(:focus) {
+      --o-input-border-color: #{map-get($grays, '600')};
+    }
   }
 }
 
 .o_form_view:not(.o_field_highlight) {
   .o_form_view_container {
-    .o_field_widget:not(.o_field_invalid):not(.o_field_highlight) .o_input:not(:hover):not(:focus) {
+    &:not(.o_field_highlight) .o_field_widget:not(.o_field_invalid):not(.o_field_highlight) .o_input:not(:hover):not(:focus) {
       --o-input-border-color: #{map-get($grays, '200')};
     }
+    &:not(.o_field_highlight) .o_required_modifier.o_field_widget:not(.o_field_invalid):not(.o_field_highlight) .o_input:not(:hover):not(:focus) {
+      --o-input-border-color: #{map-get($grays, '600')};
+    }
   }
 }
 
@@ -23,3 +29,74 @@
   }
 }
 
+//navbar
+$o-navbar-background: rgba($o-brand-odoo, .06);
+
+.o_main_navbar {
+  --NavBar-entry-backgroundColor: $o-navbar-background;
+  background: $o-navbar-background;
+}
+//navbar 的下拉箭头
+//在顶部
+.o_main_navbar {
+  .o_menu_sections {
+    .dropdown.dropdown-toggle {
+      span::after {
+        display: inline-block;
+        margin-left: 3.4px;
+        vertical-align: 3.4px;
+        content: "";
+        border-top: 4px solid;
+        border-right: 4px solid transparent;
+        border-bottom: 0;
+        border-left: 4px solid transparent;
+      }
+    }
+  }
+}
+
+//在底部时
+.o_web_client.navbar_pos_bottom {
+  .o_main_navbar {
+    .o_menu_sections {
+      .dropdown.dropdown-toggle {
+        span::after {
+          border-top: 0;
+          border-bottom: 4px solid;
+          display: inline-block;
+          margin-left: 3.4px;
+          vertical-align: 3.4px;
+          content: "";
+          border-right: 4px solid transparent;
+          border-left: 4px solid transparent;
+        }
+      }
+
+      .dropup.dropdown-toggle {
+        span::after {
+          border-top: 0;
+          border-bottom: 4px solid;
+          display: inline-block;
+          margin-left: 3.4px;
+          vertical-align: 3.4px;
+          content: "";
+          border-right: 4px solid transparent;
+          border-left: 4px solid transparent;
+        }
+      }
+    }
+  }
+}
+//在顶部和底部时
+.o-overlay-container {
+  .dropdown-menu_group.dropdown-header::after {
+    display: inline-block;
+    margin-left: 3.4px;
+    vertical-align: 3.4px;
+    content: "";
+    border-top: 4px solid;
+    border-right: 4px solid transparent;
+    border-bottom: 0;
+    border-left: 4px solid transparent;
+  }
+}
\ No newline at end of file
diff --git a/app_web_enterprise/static/src/scss/navbar_before.scss b/app_web_enterprise/static/src/scss/navbar_before.scss
deleted file mode 100644
index c5829f32..00000000
--- a/app_web_enterprise/static/src/scss/navbar_before.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-$o-navbar-background: rgba($o-brand-odoo, .05);
-
-.o_main_navbar {
-  --NavBar-entry-backgroundColor: $o-navbar-background;
-  background: $o-navbar-background;
-
-    .o_menu_sections {
-      .o_nav_entry, .dropdown-toggle {
-        background: var(--NavBar-entry-backgroundColor, transparent);
-      }
-    }
-}
\ No newline at end of file
diff --git a/app_web_enterprise/static/src/webclient/navbar.xml b/app_web_enterprise/static/src/webclient/navbar.xml
index cabcdd70..026abec8 100644
--- a/app_web_enterprise/static/src/webclient/navbar.xml
+++ b/app_web_enterprise/static/src/webclient/navbar.xml
@@ -1,24 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <templates xml:space="preserve">
 
-<t t-name="app_web_enterprise.EnterpriseNavBar" t-inherit="web_enterprise.EnterpriseNavBar" t-inherit-mode="extension">
-    <xpath expr="//a[hasclass('o_menu_toggle')]" position="replace">
-        <a href="#" class="o_menu_toggle" t-att-class="{'hasImage': currentApp &amp;&amp; currentApp.webIconData}" accesskey="h" t-ref="menuApps" t-on-click.prevent="() => this.hm.toggle()">
-            <i class="o_menu_toggle_icon text-primary fa fa-2x fa-opera" style="padding-right:8px;" role="img"/>
-            <img
-                t-if="currentApp &amp;&amp; currentApp.webIconData"
-                t-att-src="currentApp.webIconData"
-                class="o_menu_brand_icon d-none d-lg-inline position-absolute start-0 h-100 ps-1 ms-2"
-                t-att-alt="currentApp.name"
-                t-ref="appIcon"/>
+<!--<t t-name="app_web_enterprise.EnterpriseNavBar" t-inherit="web_enterprise.EnterpriseNavBar" t-inherit-mode="extension">-->
+<!--&lt;!&ndash;   todo: 以下主要是测试，改这个主图标为 O &ndash;&gt;-->
+<!--    <xpath expr="//a[hasclass('o_menu_toggle')]" position="replace">-->
+<!--        <a href="#" class="o_menu_toggle" t-att-class="{'hasImage': currentApp &amp;&amp; currentApp.webIconData}" accesskey="h" t-ref="menuApps" t-on-click.prevent="() => this.hm.toggle()">-->
+<!--            <i class="o_menu_toggle_icon text-primary fa fa-2x fa-opera" style="padding-right:8px;" role="img"/>-->
+<!--            <img-->
+<!--                t-if="currentApp &amp;&amp; currentApp.webIconData"-->
+<!--                t-att-src="currentApp.webIconData"-->
+<!--                class="o_menu_brand_icon d-none d-lg-inline position-absolute start-0 h-100 ps-1 ms-2"-->
+<!--                t-att-alt="currentApp.name"-->
+<!--                t-ref="appIcon"/>-->
 
-            <span
-                t-if="currentApp"
-                t-esc="currentApp.name"
-                class="o_menu_brand d-none d-md-flex ms-3 pe-0"/>
-        </a>
-    </xpath>
-</t>
+<!--            <span-->
+<!--                t-if="currentApp"-->
+<!--                t-esc="currentApp.name"-->
+<!--                class="o_menu_brand d-none d-md-flex ms-3 pe-0"/>-->
+<!--        </a>-->
+<!--    </xpath>-->
+<!--</t>-->
     <!--    菜单有下拉箭头， owl的在 web.NavBar， 首行用 MenuDropdown， 下拉的用 DropdownItem -->
     <!--    owl NavBar-->
 <!--    <t t-name="app_web_enterprise.NavBar.SectionsMenu" t-inherit="web.NavBar.SectionsMenu" t-inherit-mode="extension">-->
diff --git a/app_web_enterprise/static/src/xml/res_config_edition.xml b/app_web_enterprise/static/src/xml/res_config_edition.xml
index fef23cda..b1e59b0e 100644
--- a/app_web_enterprise/static/src/xml/res_config_edition.xml
+++ b/app_web_enterprise/static/src/xml/res_config_edition.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <templates xml:space="preserve">
-	<t t-inherit="web.res_config_edition" t-inherit-mode="extension">
-        <xpath expr="//h3" position="replace">
+	<t t-inherit="res_config_edition" t-inherit-mode="extension" owl="1">
+		<xpath expr="//div[hasclass('user-heading')]//h3" position="replace">
             <h3 class="px-0">
                 Odoo <t t-esc="serverVersion"/> (<a target="_blank" href="https://www.odooai.cn" style="text-decoration: underline;">odooai.cn</a> Edition)
             </h3>