diff --git a/appstore/Amos_Style/views/webclient_templates.xml b/appstore/Amos_Style/views/webclient_templates.xml index 7f551c4ca0e86a84c334408e0a99c3d835955d64..6705c9494c171f448e54e0b4d053e7b72442e72b 100644 --- a/appstore/Amos_Style/views/webclient_templates.xml +++ b/appstore/Amos_Style/views/webclient_templates.xml @@ -1,5 +1,5 @@ - + - - + diff --git a/appstore/documents/static/src/scss/documents_kanban_view_mobile.scss b/appstore/documents/static/src/scss/documents_kanban_view_mobile.scss index 5ae78f8f70586bb26f3568e3e3cfcd10a60ee682..81ee7d9baf2fcc7b99d2481854e09436d20451cb 100644 --- a/appstore/documents/static/src/scss/documents_kanban_view_mobile.scss +++ b/appstore/documents/static/src/scss/documents_kanban_view_mobile.scss @@ -1,3 +1,12 @@ + +@mixin o-details-hide-caret { + // Hide the caret. For details see https://developer.mozilla.org/en-US/docs/Web/HTML/Element/summary + list-style-type: none; + &::-webkit-details-marker { + display: none; + } +} + @include media-breakpoint-down(sm) { .o_documents_content { details.o_documents_mobile_inspector { diff --git a/appstore/sbomp_test_ip/data/sbomp_test_ip_reset.xml b/appstore/sbomp_test_ip/data/sbomp_test_ip_reset.xml index 49d5fcbbd13332e6b9d6166397485f13c23e6a68..b04288692ec8dc2644fd4bf59fd0cf8ac8c6573c 100644 --- a/appstore/sbomp_test_ip/data/sbomp_test_ip_reset.xml +++ b/appstore/sbomp_test_ip/data/sbomp_test_ip_reset.xml @@ -1,9 +1,9 @@ - + - + diff --git a/appstore/sbomp_test_ip/views/sbomp_test_ip_views.xml b/appstore/sbomp_test_ip/views/sbomp_test_ip_views.xml index bf7931f8bd7e1e837edfb0a78a68e76a052eec48..3b1a81eb354eaa8c89bba98ba9ba9cbb83ab39f7 100644 --- a/appstore/sbomp_test_ip/views/sbomp_test_ip_views.xml +++ b/appstore/sbomp_test_ip/views/sbomp_test_ip_views.xml @@ -1,5 +1,5 @@ - + sbomp.test.ip.form @@ -62,4 +62,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/appstore/web_password_widget/static/src/js/widget/password.js b/appstore/web_password_widget/static/src/js/widget/password.js index 78c10b8a11b3c462887162997d3e64d1008c75ef..4e61362584deef77d639f9e5ec6d44f5cc49fef1 100644 --- a/appstore/web_password_widget/static/src/js/widget/password.js +++ b/appstore/web_password_widget/static/src/js/widget/password.js @@ -1,4 +1,4 @@ -odoo.define("web.PasswordFieldText", function (require) { +dtcloud.define("web.PasswordFieldText", function (require) { 'use strict'; var core = require('web.core'); diff --git a/dtcloud/tools/nebula_mongo_tools.py b/dtcloud/tools/nebula_mongo_tools.py index 65bd9e053f0687373bfa8d40df98cd2b62da8c69..aa5c327a2807b78c3ad486ea74ad4fea3ebcf24c 100644 --- a/dtcloud/tools/nebula_mongo_tools.py +++ b/dtcloud/tools/nebula_mongo_tools.py @@ -1,4 +1,4 @@ -from odoo.tools import config +from dtcloud.tools import config def connect_mongo_table(mongo_db_collection='sbomp_energy_log', only_read=True): # 连接mongo_db 返回表,默认只读 diff --git a/dtcloud/tools/nebula_tools.py b/dtcloud/tools/nebula_tools.py index c86165731511aab3739b0bc5a3ef8f96a0eab4db..be412bb2799aa0e312374778601039ba8835e3dc 100644 --- a/dtcloud/tools/nebula_tools.py +++ b/dtcloud/tools/nebula_tools.py @@ -7,7 +7,7 @@ from datetime import datetime, timedelta import pytz import unittest -from odoo.tools import config +from dtcloud.tools import config from .nebula_sql_base import get_select_sql_base, get_update_sql_base, get_insert_sql_base from .nebula_sql_lite_tools import nebula_select_sql_lite, nebula_update_sql_lite, nebula_create_sql_lite