diff --git a/app_web_enterprise/__manifest__.py b/app_web_enterprise/__manifest__.py index 9493e3d0..1359f626 100644 --- a/app_web_enterprise/__manifest__.py +++ b/app_web_enterprise/__manifest__.py @@ -18,9 +18,9 @@ { 'name': "odoo Enterprise enhance Pack,企业版界面及操作增强", - 'version': '23.11.16', + 'version': '24.08.17', 'author': 'odooai.cn', - 'category': 'Base', + 'category': 'Extra tools', 'website': 'https://www.odooai.cn', 'live_test_url': 'https://demo.odooapp.cn', 'license': 'LGPL-3', @@ -30,6 +30,7 @@ 1. Add dropdown arrow to parent menu. 2. Replace the odoo logo to your company logo in main menu. 3. Alway show search in main menu. + 4. Table and report UI enhance(Grid View). """, 'description': """ odoo enterprise version UI enhance. @@ -42,8 +43,10 @@ 替换主菜单界面的logo为你公司的logo。 4. Add underline for input field. 在可编辑字段下方增加下划线,易于分辨。 - 5. Add grid line form list view. Easy to read list data. + 5. Add grid line form list view. Easy to read list data. 为表格list增加行列分隔线,易于看数据。 + 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. 13. Full Open Source. @@ -51,7 +54,7 @@ 1. 2. 11. 多语言支持,多公司支持 - 12. Odoo 16,15,14,13,12, 企业版,社区版,在线SaaS.sh版,等全版本支持 + 12. Odoo 17,16,15,14,13,12, 企业版,社区版,在线SaaS.sh版,等全版本支持 13. 代码完全开源 """, 'price': 68.00, @@ -70,24 +73,23 @@ 'web._assets_primary_variables': [ ('before', 'web_enterprise/static/src/scss/primary_variables.scss', 'app_web_enterprise/static/src/scss/primary_variables.scss'), ], - # 处理header 变更 'web.assets_backend': [ - ('before', 'web/static/src/webclient/navbar/navbar.scss', 'app_web_enterprise/static/src/scss/navbar_before.scss'), # ('after', 'web/static/src/webclient/navbar/navbar.scss', 'app_web_enterprise/static/src/scss/navbar.scss'), + ('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/components/*/*.xml', - 'app_web_enterprise/static/src/webclient/navbar.xml', - 'app_web_enterprise/static/src/xml/res_config_edition.xml', - 'app_web_enterprise/static/src/xml/form.xml', + 'app_web_enterprise/static/src/components/*/*.xml', + 'app_web_enterprise/static/src/webclient/**/*.xml', + 'app_web_enterprise/static/src/xml/**/*.xml', + # 'app_web_enterprise/static/src/xml/base.xml', ], # 这里是改样式,要 after处理 'web.assets_common': [ - # ('after', 'web/static/lib/jquery.ui/jquery-ui.css', 'app_web_enterprise/static/lib/jquery.ui/jquery-ui.css'), - # ('after', 'web_enterprise/static/src/webclient/home_menu/home_menu_background.scss', 'app_web_enterprise/static/src/scss/home_menu_background.scss'), + ('after', 'web/static/lib/jquery.ui/jquery-ui.css', 'app_web_enterprise/static/lib/jquery.ui/jquery-ui.css'), + ('after', 'web_enterprise/static/src/webclient/home_menu/home_menu_background.scss', 'app_web_enterprise/static/src/scss/home_menu_background.scss'), ], 'web.assets_frontend': [ # ('after', 'web/static/src/core/**/*', 'app_web_enterprise/static/src/xml/base.xml'), - # ('after', 'web_enterprise/static/src/webclient/home_menu/home_menu_background.scss', 'app_web_enterprise/static/src/scss/home_menu_background.scss'), - # 'app_web_enterprise/static/src/scss/app_style_website.scss', + ('after', 'web_enterprise/static/src/webclient/home_menu/home_menu_background.scss', 'app_web_enterprise/static/src/scss/home_menu_background.scss'), + 'app_web_enterprise/static/src/scss/app_style_website.scss', ], }, diff --git a/app_web_enterprise/static/description/b05.png b/app_web_enterprise/static/description/b05.png new file mode 100644 index 00000000..d8d8f6a4 Binary files /dev/null and b/app_web_enterprise/static/description/b05.png differ diff --git a/app_web_enterprise/static/description/index.html b/app_web_enterprise/static/description/index.html index c67b4c10..25e6ba3b 100644 --- a/app_web_enterprise/static/description/index.html +++ b/app_web_enterprise/static/description/index.html @@ -14,6 +14,9 @@ + + +
@@ -21,7 +24,7 @@

More Powerful addons: odooai.cn Odoo Addons

-

Lastest update: v16.23.09.04

+

Latest update: v17.24.08.17

This moduld allows user to .

  • 1.Add dropdown arrow to parent menu.
  • @@ -43,12 +46,6 @@
- -
- -
-
-
@@ -61,6 +58,29 @@
+
+ +
+
+

5. Add grid line form list view. Easy to read list data.

+

+
+ +
+
+
+ +
+
+

6. Add grid line to Account Reports. Easy to view Data.

+

+
+ +
+
+
+ +
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 index 23c9149f..814d99b7 100644 --- a/app_web_enterprise/static/src/components/tracking_value/tracking_value.xml +++ b/app_web_enterprise/static/src/components/tracking_value/tracking_value.xml @@ -1,11 +1,11 @@ - - - - - - - - + + + + + + + + diff --git a/app_web_enterprise/static/src/scss/app_style_after.scss b/app_web_enterprise/static/src/scss/app_style_after.scss index 27660e78..602aa68b 100644 --- a/app_web_enterprise/static/src/scss/app_style_after.scss +++ b/app_web_enterprise/static/src/scss/app_style_after.scss @@ -32,6 +32,10 @@ } } + //列表标头下显示边框,标尾头显示边框 + > :not(:first-child) { + border-top-width: 2px; + } //列表标头左右下显示边框 --ListRenderer-thead-border-end-color: #{map-get($grays, '300')}; @@ -55,13 +59,54 @@ min-width: 4rem; } } +@media (max-width: 768px) { + .o_form_view .o_form_view_container { + // create 按键 + button.o_form_button_create { + padding: 7px 10px; + } + .o_form_sheet_bg .o_form_sheet { + margin: 6px auto; + max-width: 98%; + } + } +} @media (min-width: 768px) { + .o_form_view .o_form_view_container .o_form_sheet_bg .o_form_sheet { + max-width: 98%; + } .o_form_view .o_form_view_container .o_notebook .o_notebook_headers { overflow-x: inherit; } } +@media (min-width: 992px) { + .o_form_view .o_form_view_container .o_form_sheet_bg .o_form_sheet { + max-width: 98%; + } +} + +@media (min-width: 1200px) { + .o_form_view .o_form_view_container .o_form_sheet_bg .o_form_sheet { + max-width: 98%; + } +} + + +@media (min-width: 1400px) { + .o_form_view .o_form_view_container .o_form_sheet_bg .o_form_sheet { + max-width: 98%; + } +} + +// report +.o_account_reports_page .o_account_reports_table { + .o_account_report_column_value tr > td.number { + border-left: 1px solid var(--AccountFinancial-border-color, #bbb); + } +} + //izi .izi_view { .izi_dashboard_filter_title span { 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 9c29a8a8..ba68f580 100644 --- a/app_web_enterprise/static/src/scss/app_style_before.scss +++ b/app_web_enterprise/static/src/scss/app_style_before.scss @@ -6,3 +6,20 @@ } } } + +.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) { + --o-input-border-color: #{map-get($grays, '200')}; + } + } +} + +.o_dialog_container { + .o_form_view: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')}; + } + } +} + diff --git a/app_web_enterprise/static/src/webclient/navbar.xml b/app_web_enterprise/static/src/webclient/navbar.xml index c747726b..0217b121 100644 --- a/app_web_enterprise/static/src/webclient/navbar.xml +++ b/app_web_enterprise/static/src/webclient/navbar.xml @@ -1,13 +1,25 @@ - - - - - - - + + + + + + + + + + + diff --git a/app_web_enterprise/static/src/xml/form.xml b/app_web_enterprise/static/src/xml/form.xml index c015b93e..a253abf3 100644 --- a/app_web_enterprise/static/src/xml/form.xml +++ b/app_web_enterprise/static/src/xml/form.xml @@ -9,18 +9,20 @@ - - - - Save - - - Discard - - - + + + + + + + + + + + +