From 7d14564dbaf79893d873adc3d1d3b3b54e1f7d80 Mon Sep 17 00:00:00 2001
From: Ivan Office <guohuadeng@hotmail.com>
Date: Mon, 19 Aug 2024 21:40:50 +0800
Subject: [PATCH] fix xml error

---
 app_common/rng/common.rng                     |  6 ++++++
 app_common/views/ir_cron_views.xml            |  1 -
 .../data/ir_config_parameter_data.xml         |  4 ++--
 app_odoo_customize/security/res_groups.xml    |  4 ++--
 .../static/description/index.html             |  1 -
 .../static/description/index_cn.html          |  1 -
 app_odoo_customize/static/src/js/ribbon.js    | 10 +++++-----
 app_odoo_customize/static/src/js/user_menu.js | 11 ++++------
 .../static/src/xml/res_config_edition.xml     |  4 ++--
 .../views/ir_module_module_views.xml          | 20 +++++++++----------
 .../views/res_config_settings_views.xml       |  4 ++--
 11 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/app_common/rng/common.rng b/app_common/rng/common.rng
index 0acd4c8e..e1047f2e 100644
--- a/app_common/rng/common.rng
+++ b/app_common/rng/common.rng
@@ -348,6 +348,7 @@
             <rng:optional><rng:attribute name="aria-label"/></rng:optional>
             <rng:optional><rng:attribute name="aria-pressed"/></rng:optional>
             <rng:optional><rng:attribute name="display"/></rng:optional>
+            <rng:optional><rng:attribute name="data-hotkey"/></rng:optional>
             <rng:zeroOrMore>
                 <rng:choice>
                     <rng:ref name="field" />
@@ -381,6 +382,10 @@
             <rng:optional><rng:attribute name="help"/></rng:optional>
             <rng:optional><rng:attribute name="domain"/></rng:optional>
             <rng:optional><rng:attribute name="date"/></rng:optional>
+            <rng:optional><rng:attribute name="start_month"/></rng:optional>
+            <rng:optional><rng:attribute name="end_month"/></rng:optional>
+            <rng:optional><rng:attribute name="start_year"/></rng:optional>
+            <rng:optional><rng:attribute name="end_year"/></rng:optional>
             <rng:optional><rng:attribute name="default_period"/></rng:optional>
             <rng:zeroOrMore>
                 <rng:choice>
@@ -422,6 +427,7 @@
         <rng:element name="widget">
             <rng:attribute name="name"/>
             <rng:optional><rng:attribute name="options"/></rng:optional>
+            <rng:optional><rng:attribute name="width"/></rng:optional>
         </rng:element>
     </rng:define>
 
diff --git a/app_common/views/ir_cron_views.xml b/app_common/views/ir_cron_views.xml
index 597e6e4f..40c65a60 100644
--- a/app_common/views/ir_cron_views.xml
+++ b/app_common/views/ir_cron_views.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0"?>
 <odoo>
     <record id="app_ir_cron_view_tree" model="ir.ui.view">
         <field name="name">app.ir.cron.tree</field>
diff --git a/app_odoo_customize/data/ir_config_parameter_data.xml b/app_odoo_customize/data/ir_config_parameter_data.xml
index 41e39780..33f29d0e 100644
--- a/app_odoo_customize/data/ir_config_parameter_data.xml
+++ b/app_odoo_customize/data/ir_config_parameter_data.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<openerp>
+<odoo>
     <data noupdate="1">
         <function model="ir.config_parameter" name="set_param" eval="('app_system_name', 'odooAi')"/>
         <function model="ir.config_parameter" name="set_param" eval="('app_show_lang', 'True')"/>
@@ -24,4 +24,4 @@
         <function model="ir.config_parameter" name="set_param" eval="('app_navbar_pos_mobile', 'bottom')"/>
         <function model="ir.config_parameter" name="set_param" eval="('app_debug_only_admin', 'True')"/>
     </data>
-</openerp>
\ No newline at end of file
+</odoo>
\ No newline at end of file
diff --git a/app_odoo_customize/security/res_groups.xml b/app_odoo_customize/security/res_groups.xml
index c4ae9968..90e02958 100644
--- a/app_odoo_customize/security/res_groups.xml
+++ b/app_odoo_customize/security/res_groups.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<openerp>
+<odoo>
     <data noupdate="0">
         <record id="group_show_author_in_apps" model="res.groups">
             <field name="name">Show Author in Apps Dashboard</field>
@@ -16,4 +16,4 @@
                    eval="[(4, ref('app_odoo_customize.group_show_quick_upgrade'))]"/>
         </record>
     </data>
-</openerp>
\ No newline at end of file
+</odoo>
\ No newline at end of file
diff --git a/app_odoo_customize/static/description/index.html b/app_odoo_customize/static/description/index.html
index ef61b507..0fd795cd 100644
--- a/app_odoo_customize/static/description/index.html
+++ b/app_odoo_customize/static/description/index.html
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!--
 # -*- coding: utf-8 -*-
 ##############################################################################
diff --git a/app_odoo_customize/static/description/index_cn.html b/app_odoo_customize/static/description/index_cn.html
index b6e68eff..ecbe94d5 100644
--- a/app_odoo_customize/static/description/index_cn.html
+++ b/app_odoo_customize/static/description/index_cn.html
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!--
 # -*- coding: utf-8 -*-
 ##############################################################################
diff --git a/app_odoo_customize/static/src/js/ribbon.js b/app_odoo_customize/static/src/js/ribbon.js
index 0019a969..f6530e97 100644
--- a/app_odoo_customize/static/src/js/ribbon.js
+++ b/app_odoo_customize/static/src/js/ribbon.js
@@ -41,28 +41,28 @@ export class WebEnvironmentRibbon extends Component {
     }
 
     showRibbon() {
-        const ribbon = $(".test-ribbon");
+        const ribbon = document.querySelector('.test-ribbon');
         const self = this;
-        ribbon.hide();
+        ribbon.classList.add('o_hidden');
         // Get ribbon data from backend
         self.orm
             .call("web.environment.ribbon.backend", "get_environment_ribbon")
             .then(function (ribbon_data) {
                 // Ribbon name
                 if (ribbon_data.name && ribbon_data.name !== "False") {
-                    ribbon.show();
+                    ribbon.classList.remove('o_hidden');
                     ribbon.html(ribbon_data.name);
                 }
                 // Ribbon color
                 if (ribbon_data.color && self.validStrColour(ribbon_data.color)) {
-                    ribbon.css("color", ribbon_data.color);
+                    ribbon.style.color = ribbon_data.color;
                 }
                 // Ribbon background color
                 if (
                     ribbon_data.background_color &&
                     self.validStrColour(ribbon_data.background_color)
                 ) {
-                    ribbon.css("background-color", ribbon_data.background_color);
+                    ribbon.style.backgroundColor = ribbon_data.background_color;
                 }
             });
     }
diff --git a/app_odoo_customize/static/src/js/user_menu.js b/app_odoo_customize/static/src/js/user_menu.js
index 0ec5b08b..d37c164a 100644
--- a/app_odoo_customize/static/src/js/user_menu.js
+++ b/app_odoo_customize/static/src/js/user_menu.js
@@ -3,7 +3,7 @@
 
 import { _t } from "@web/core/l10n/translation";
 import { UserMenu } from "@web/webclient/user_menu/user_menu";
-import { routeToUrl } from "@web/core/browser/router_service";
+import { router } from "@web/core/browser/router";
 import { patch } from "@web/core/utils/patch";
 import { browser } from "@web/core/browser/browser";
 import { registry } from "@web/core/registry";
@@ -17,7 +17,6 @@ patch(UserMenu.prototype, {
 
         "use strict";
         // this.companyService = useService("company");
-        this.rpc = useService("rpc");
         this.orm = useService("orm");
         this.app_show_lang = session.app_show_lang;
         this.app_lang_list = session.app_lang_list;
@@ -111,7 +110,7 @@ function debugItem(env) {
         id: "debug",
         description: _t("Activate the developer mode"),
         callback: () => {
-            browser.location.search = "?debug=1";
+            router.pushState({ debug: 1 }, { reload: true });
         },
         sequence: 5,
     };
@@ -123,7 +122,7 @@ function activateAssetsDebugging(env) {
         type: "item",
         description: _t("Activate Assets Debugging"),
         callback: () => {
-            browser.location.search = "?debug=assets";
+            router.pushState({ debug: 'assets' }, { reload: true });
         },
         sequence: 6,
     };
@@ -135,9 +134,7 @@ function leaveDebugMode(env) {
         type: "item",
         description: _t("Leave the Developer Tools"),
         callback: () => {
-            const route = env.services.router.current;
-            route.search.debug = "";
-            browser.location.href = browser.location.origin + routeToUrl(route);
+            router.pushState({ debug: 0 }, { reload: true });
         },
         sequence: 7,
     };
diff --git a/app_odoo_customize/static/src/xml/res_config_edition.xml b/app_odoo_customize/static/src/xml/res_config_edition.xml
index 47362421..8707684f 100644
--- a/app_odoo_customize/static/src/xml/res_config_edition.xml
+++ b/app_odoo_customize/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" owl="1">
-		<xpath expr="//div[hasclass('user-heading')]//h3" position="replace">
+	<t t-inherit="res_config_edition" t-inherit-mode="extension">
+        <xpath expr="//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>
diff --git a/app_odoo_customize/views/ir_module_module_views.xml b/app_odoo_customize/views/ir_module_module_views.xml
index 59844e98..5c167fe2 100644
--- a/app_odoo_customize/views/ir_module_module_views.xml
+++ b/app_odoo_customize/views/ir_module_module_views.xml
@@ -60,25 +60,25 @@
             <field name="inherit_id" ref="base.module_view_kanban"/>
             <field name="arch" type="xml">
                 <!--点击模块看详情-->
-                <xpath expr="//div[hasclass('oe_module_vignette')]" position="attributes" groups="app_odoo_customize.group_show_quick_upgrade">
-                    <attribute name="class" position="add" separator=" ">oe_kanban_global_click</attribute>
-                </xpath>
+<!--                <xpath expr="//aside/.." position="attributes" groups="app_odoo_customize.group_show_quick_upgrade">-->
+<!--                    <attribute name="class" position="add" separator=" ">oe_kanban_global_click</attribute>-->
+<!--                </xpath>-->
                 <!--让模块名更显眼-->
-                <xpath expr="//div[hasclass('oe_module_desc')]//code" position="replace"/>
-                <xpath expr="//div[hasclass('oe_module_desc')]//h4" position="after">
-                    <code><field name="name"/></code>
+                <xpath expr="//main//code" position="attributes">
+                    <attribute name="groups"></attribute>
                 </xpath>
                 <!--显示快速升级-->
-                <xpath expr="//div[hasclass('oe_module_action')]" position="inside" groups="app_odoo_customize.group_show_quick_upgrade">
-                    <button type="object" class="btn btn-default btn-sm float-right" name="button_uninstall_wizard" t-if="installed">Uninstall</button>
-                    <button type="object" class="btn btn-success btn-sm float-right" name="button_immediate_upgrade" t-if="installed">Upgrade</button>
+                <xpath expr="//button[@name='button_immediate_install']" position="after">
+                    <button type="object" class="btn btn-default btn-sm float-right" name="button_uninstall_wizard"
+                             groups="base.group_system" invisible="state != 'installed'">Uninstall</button>
+                    <button type="object" class="btn btn-success btn-sm float-right" name="button_immediate_upgrade"
+                             groups="base.group_system" invisible="state != 'installed'">Upgrade</button>
                 </xpath>
                 <!--显示导出翻译-->
                 <xpath expr="//t[@t-name='kanban-menu']" position="inside">
                     <a t-if="installed" name="%(app_odoo_customize.action_server_module_multi_get_po)d" type="action" role="menuitem" class="dropdown-item">Export Translation</a>
                     <a t-if="installed" name="%(app_odoo_customize.action_server_module_multi_refresh_po)d" type="action" role="menuitem" class="dropdown-item">Refresh Translation</a>
                 </xpath>
-                <xpath expr="//div[hasclass('oe_module_action')]/a[@target='_blank']" position="replace" groups="app_odoo_customize.group_show_quick_upgrade"/>
             </field>
         </record>
     <!--默认打开可更新模块-->
diff --git a/app_odoo_customize/views/res_config_settings_views.xml b/app_odoo_customize/views/res_config_settings_views.xml
index c0e9e0be..927d87f1 100644
--- a/app_odoo_customize/views/res_config_settings_views.xml
+++ b/app_odoo_customize/views/res_config_settings_views.xml
@@ -6,9 +6,9 @@
             <field name="model">res.config.settings</field>
             <field name="inherit_id" ref="base_setup.res_config_settings_view_form" />
             <field name="arch" type="xml">
-                <setting id="appstore" position="attributes">
+				<xpath expr="//block[@name='about_setting_container']//widget[@name='mobile_apps_funnel']" position="attributes">
                     <attribute name="invisible">1</attribute>
-                </setting>
+                </xpath>
             </field>
         </record>
     </data>