From fc5847425989f41edf2c8c21ab52ca60d7b4c05e Mon Sep 17 00:00:00 2001
From: Ivan Office <guohuadeng@hotmail.com>
Date: Mon, 16 Dec 2024 21:33:23 +0800
Subject: [PATCH] =?UTF-8?q?prepare=20#IBBNQZ=2018-app=5Fsale=5Fdate?=
 =?UTF-8?q?=E5=92=8Capp=5Fpurchase=5Fdate=E7=AD=89=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app_base_chinese/__manifest__.py                              | 2 +-
 app_base_chinese/data/res_lang_data.xml                       | 3 ++-
 app_web_enterprise/static/src/webclient/navbar.scss           | 1 +
 app_web_enterprise/static/src/webclient/navbar.variables.scss | 1 -
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app_base_chinese/__manifest__.py b/app_base_chinese/__manifest__.py
index a42f4359..f474affa 100644
--- a/app_base_chinese/__manifest__.py
+++ b/app_base_chinese/__manifest__.py
@@ -18,7 +18,7 @@
 
 {
     'name': 'odoo中文版套件之基础,中国会计基础,Chinese Enhance All in One',
-    'version': '18.0.24.11.11',
+    'version': '18.0.24.12.16',
     'author': 'odooai.cn',
     'category': 'Base',
     'website': 'https://www.odooai.cn',
diff --git a/app_base_chinese/data/res_lang_data.xml b/app_base_chinese/data/res_lang_data.xml
index f0681a02..951b7303 100644
--- a/app_base_chinese/data/res_lang_data.xml
+++ b/app_base_chinese/data/res_lang_data.xml
@@ -5,7 +5,8 @@
         <record id="base.lang_zh_CN" model="res.lang" context="{'lang': 'zh_CN'}">
             <field name="name">中文</field>
             <field name="date_format">%Y-%m-%d</field>
-            <field name="time_format">%H:%M:%S</field>
+<!--            此处将所有默认时间都精确至 秒，如有特殊需求在相关模块再处理-->
+            <field name="time_format">%H:%M</field>
             <field name="short_time_format">%H:%M</field>
             <field name="week_start">7</field>
             <field name="active" eval="True"/>
diff --git a/app_web_enterprise/static/src/webclient/navbar.scss b/app_web_enterprise/static/src/webclient/navbar.scss
index 345ed4b9..aab481ce 100644
--- a/app_web_enterprise/static/src/webclient/navbar.scss
+++ b/app_web_enterprise/static/src/webclient/navbar.scss
@@ -11,5 +11,6 @@
     --NavBar-entry-backgroundColor--hover: #{$o-navbar-entry-bg--hover};
     --NavBar-entry-backgroundColor--active: #{$o-navbar-entry-bg--active};
     --NavBar-entry-backgroundColor--focus: #{$o-navbar-entry-bg--hover};
+    background: linear-gradient(45deg, #{$o-brand-odoo}, #{$o-action});
   }
 }
\ No newline at end of file
diff --git a/app_web_enterprise/static/src/webclient/navbar.variables.scss b/app_web_enterprise/static/src/webclient/navbar.variables.scss
index 7f31e1e3..face4bd2 100644
--- a/app_web_enterprise/static/src/webclient/navbar.variables.scss
+++ b/app_web_enterprise/static/src/webclient/navbar.variables.scss
@@ -9,5 +9,4 @@ $o-navbar-entry-color--active: $o-brand-lightsecondary ;
 
 $o-navbar-brand-color: $o-brand-lightsecondary;
 
-$o-navbar-background: linear-gradient(45deg, #{$o-brand-odoo}, #{$o-action});