audrius/app-odoo
1
0
Fork 0
mirror of https://github.com/guohuadeng/app-odoo.git synced 2025-02-23 04:11:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix xml error

Browse Source
This commit is contained in:
Ivan Office
2024-08-19 21:40:50 +08:00
parent 7025bb9611
commit 7d14564dba
11 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app_common/rng/common.rng
View File

@@ -348,6 +348,7 @@
<rng:optional><rng:attribute name="aria-label"/></rng:optional> <rng:optional><rng:attribute name="aria-label"/></rng:optional>
<rng:optional><rng:attribute name="aria-pressed"/></rng:optional> <rng:optional><rng:attribute name="aria-pressed"/></rng:optional>
<rng:optional><rng:attribute name="display"/></rng:optional> <rng:optional><rng:attribute name="display"/></rng:optional>
<rng:optional><rng:attribute name="data-hotkey"/></rng:optional>
<rng:zeroOrMore> <rng:zeroOrMore>
<rng:choice> <rng:choice>
<rng:ref name="field" /> <rng:ref name="field" />
@@ -381,6 +382,10 @@
<rng:optional><rng:attribute name="help"/></rng:optional> <rng:optional><rng:attribute name="help"/></rng:optional>
<rng:optional><rng:attribute name="domain"/></rng:optional> <rng:optional><rng:attribute name="domain"/></rng:optional>
<rng:optional><rng:attribute name="date"/></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:optional><rng:attribute name="default_period"/></rng:optional>
<rng:zeroOrMore> <rng:zeroOrMore>
<rng:choice> <rng:choice>
@@ -422,6 +427,7 @@
<rng:element name="widget"> <rng:element name="widget">
<rng:attribute name="name"/> <rng:attribute name="name"/>
<rng:optional><rng:attribute name="options"/></rng:optional> <rng:optional><rng:attribute name="options"/></rng:optional>
<rng:optional><rng:attribute name="width"/></rng:optional>
</rng:element> </rng:element>
</rng:define> </rng:define>

1
app_common/views/ir_cron_views.xml
View File

@@ -1,4 +1,3 @@
<?xml version="1.0"?>
<odoo> <odoo>
<record id="app_ir_cron_view_tree" model="ir.ui.view"> <record id="app_ir_cron_view_tree" model="ir.ui.view">
<field name="name">app.ir.cron.tree</field> <field name="name">app.ir.cron.tree</field>

4
app_odoo_customize/data/ir_config_parameter_data.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<openerp> <odoo>
<data noupdate="1"> <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_system_name', 'odooAi')"/>
<function model="ir.config_parameter" name="set_param" eval="('app_show_lang', 'True')"/> <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_navbar_pos_mobile', 'bottom')"/>
<function model="ir.config_parameter" name="set_param" eval="('app_debug_only_admin', 'True')"/> <function model="ir.config_parameter" name="set_param" eval="('app_debug_only_admin', 'True')"/>
</data> </data>
</openerp> </odoo>

4
app_odoo_customize/security/res_groups.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<openerp> <odoo>
<data noupdate="0"> <data noupdate="0">
<record id="group_show_author_in_apps" model="res.groups"> <record id="group_show_author_in_apps" model="res.groups">
<field name="name">Show Author in Apps Dashboard</field> <field name="name">Show Author in Apps Dashboard</field>
@@ -16,4 +16,4 @@
eval="[(4, ref('app_odoo_customize.group_show_quick_upgrade'))]"/> eval="[(4, ref('app_odoo_customize.group_show_quick_upgrade'))]"/>
</record> </record>
</data> </data>
</openerp> </odoo>

1
app_odoo_customize/static/description/index.html
View File

@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- <!--
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
############################################################################## ##############################################################################

1
app_odoo_customize/static/description/index_cn.html
View File

@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- <!--
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
############################################################################## ##############################################################################

10
app_odoo_customize/static/src/js/ribbon.js
View File

@@ -41,28 +41,28 @@ export class WebEnvironmentRibbon extends Component {
} }
showRibbon() { showRibbon() {
const ribbon = $(".test-ribbon"); const ribbon = document.querySelector('.test-ribbon');
const self = this; const self = this;
ribbon.hide(); ribbon.classList.add('o_hidden');
// Get ribbon data from backend // Get ribbon data from backend
self.orm self.orm
.call("web.environment.ribbon.backend", "get_environment_ribbon") .call("web.environment.ribbon.backend", "get_environment_ribbon")
.then(function (ribbon_data) { .then(function (ribbon_data) {
// Ribbon name // Ribbon name
if (ribbon_data.name && ribbon_data.name !== "False") { if (ribbon_data.name && ribbon_data.name !== "False") {
ribbon.show(); ribbon.classList.remove('o_hidden');
ribbon.html(ribbon_data.name); ribbon.html(ribbon_data.name);
} }
// Ribbon color // Ribbon color
if (ribbon_data.color && self.validStrColour(ribbon_data.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 // Ribbon background color
if ( if (
ribbon_data.background_color && ribbon_data.background_color &&
self.validStrColour(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;
} }
}); });
} }

11
app_odoo_customize/static/src/js/user_menu.js
View File

@@ -3,7 +3,7 @@
import { _t } from "@web/core/l10n/translation"; import { _t } from "@web/core/l10n/translation";
import { UserMenu } from "@web/webclient/user_menu/user_menu"; 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 { patch } from "@web/core/utils/patch";
import { browser } from "@web/core/browser/browser"; import { browser } from "@web/core/browser/browser";
import { registry } from "@web/core/registry"; import { registry } from "@web/core/registry";
@@ -17,7 +17,6 @@ patch(UserMenu.prototype, {
"use strict"; "use strict";
// this.companyService = useService("company"); // this.companyService = useService("company");
this.rpc = useService("rpc");
this.orm = useService("orm"); this.orm = useService("orm");
this.app_show_lang = session.app_show_lang; this.app_show_lang = session.app_show_lang;
this.app_lang_list = session.app_lang_list; this.app_lang_list = session.app_lang_list;
@@ -111,7 +110,7 @@ function debugItem(env) {
id: "debug", id: "debug",
description: _t("Activate the developer mode"), description: _t("Activate the developer mode"),
callback: () => { callback: () => {
browser.location.search = "?debug=1"; router.pushState({ debug: 1 }, { reload: true });
}, },
sequence: 5, sequence: 5,
}; };
@@ -123,7 +122,7 @@ function activateAssetsDebugging(env) {
type: "item", type: "item",
description: _t("Activate Assets Debugging"), description: _t("Activate Assets Debugging"),
callback: () => { callback: () => {
browser.location.search = "?debug=assets"; router.pushState({ debug: 'assets' }, { reload: true });
}, },
sequence: 6, sequence: 6,
}; };
@@ -135,9 +134,7 @@ function leaveDebugMode(env) {
type: "item", type: "item",
description: _t("Leave the Developer Tools"), description: _t("Leave the Developer Tools"),
callback: () => { callback: () => {
const route = env.services.router.current; router.pushState({ debug: 0 }, { reload: true });
route.search.debug = "";
browser.location.href = browser.location.origin + routeToUrl(route);
}, },
sequence: 7, sequence: 7,
}; };

4
app_odoo_customize/static/src/xml/res_config_edition.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<templates xml:space="preserve"> <templates xml:space="preserve">
<t t-inherit="web.res_config_edition" t-inherit-mode="extension" owl="1"> <t t-inherit="res_config_edition" t-inherit-mode="extension">
<xpath expr="//div[hasclass('user-heading')]//h3" position="replace"> <xpath expr="//h3" position="replace">
<h3 class="px-0"> <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) Odoo <t t-esc="serverVersion"/> (<a target="_blank" href="https://www.odooai.cn" style="text-decoration: underline;">odooai.cn</a> Edition)
</h3> </h3>

20
app_odoo_customize/views/ir_module_module_views.xml
View File

@@ -60,25 +60,25 @@
<field name="inherit_id" ref="base.module_view_kanban"/> <field name="inherit_id" ref="base.module_view_kanban"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<!--点击模块看详情--> <!--点击模块看详情-->
<xpath expr="//div[hasclass('oe_module_vignette')]" position="attributes" groups="app_odoo_customize.group_show_quick_upgrade"> <!-- <xpath expr="//aside/.." position="attributes" groups="app_odoo_customize.group_show_quick_upgrade">-->
<attribute name="class" position="add" separator=" ">oe_kanban_global_click</attribute> <!-- <attribute name="class" position="add" separator=" ">oe_kanban_global_click</attribute>-->
</xpath> <!-- </xpath>-->
<!--让模块名更显眼--> <!--让模块名更显眼-->
<xpath expr="//div[hasclass('oe_module_desc')]//code" position="replace"/> <xpath expr="//main//code" position="attributes">
<xpath expr="//div[hasclass('oe_module_desc')]//h4" position="after"> <attribute name="groups"></attribute>
<code><field name="name"/></code>
</xpath> </xpath>
<!--显示快速升级--> <!--显示快速升级-->
<xpath expr="//div[hasclass('oe_module_action')]" position="inside" groups="app_odoo_customize.group_show_quick_upgrade"> <xpath expr="//button[@name='button_immediate_install']" position="after">
<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-default btn-sm float-right" name="button_uninstall_wizard"
<button type="object" class="btn btn-success btn-sm float-right" name="button_immediate_upgrade" t-if="installed">Upgrade</button> 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>
<!--显示导出翻译--> <!--显示导出翻译-->
<xpath expr="//t[@t-name='kanban-menu']" position="inside"> <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_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> <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>
<xpath expr="//div[hasclass('oe_module_action')]/a[@target='_blank']" position="replace" groups="app_odoo_customize.group_show_quick_upgrade"/>
</field> </field>
</record> </record>
<!--默认打开可更新模块--> <!--默认打开可更新模块-->

4
app_odoo_customize/views/res_config_settings_views.xml
View File

@@ -6,9 +6,9 @@
<field name="model">res.config.settings</field> <field name="model">res.config.settings</field>
<field name="inherit_id" ref="base_setup.res_config_settings_view_form" /> <field name="inherit_id" ref="base_setup.res_config_settings_view_form" />
<field name="arch" type="xml"> <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> <attribute name="invisible">1</attribute>
</setting> </xpath>
</field> </field>
</record> </record>
</data> </data>