From 38befa85c592d00b7fd6bb4e22e808745a581010 Mon Sep 17 00:00:00 2001
From: Ivan Office <guohuadeng@hotmail.com>
Date: Fri, 20 Dec 2024 15:03:25 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix=20=E5=9C=B0=E5=9D=80=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=EF=BC=8C=E8=A6=81=E4=B8=8D=E7=84=B6=E5=9C=A8=E7=BD=91=E7=AB=99?=
 =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E9=94=99?=
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_country_data.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app_base_chinese/__manifest__.py b/app_base_chinese/__manifest__.py
index f573a541..bdbbb79b 100644
--- a/app_base_chinese/__manifest__.py
+++ b/app_base_chinese/__manifest__.py
@@ -18,7 +18,7 @@
 
 {
     'name': 'odoo中国版，中文本土化套件,中国会计基础,Odoo Chinese localization Enhance All in One',
-    'version': '18.0.24.12.19',
+    'version': '18.0.24.12.20',
     'author': 'odooai.cn',
     'category': 'Base',
     'website': 'https://www.odooai.cn',
diff --git a/app_base_chinese/data/res_country_data.xml b/app_base_chinese/data/res_country_data.xml
index 29c5d167..570007b3 100644
--- a/app_base_chinese/data/res_country_data.xml
+++ b/app_base_chinese/data/res_country_data.xml
@@ -4,7 +4,7 @@
         <!-- Country -->
         <record id="base.cn" model="res.country">
             <field name="enforce_cities" eval="True"/>
-            <field name="address_format" eval="'%(country_name)s%(state_name)s%(city)s%(street)s\n%(street2)s'"/>
+            <field name="address_format" eval="'%(country_name)s%(state_name)s%(city)s%(street)s\n%(street2)s，%(zip)s'"/>
             <field name="address_view_id" ref="app_base_chinese.app_view_partner_form_chinese"/>
         </record>
         <function model="res.country" name="write" context="{'lang': 'zh_CN'}">

From 5751b1739b61eb4b2175350a0fc1f870175a96fc Mon Sep 17 00:00:00 2001
From: Ivan Office <guohuadeng@hotmail.com>
Date: Fri, 20 Dec 2024 17:55:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=20=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app_odoo_customize/__manifest__.py                | 6 ++----
 app_odoo_customize/static/src/xml/base_import.xml | 9 +++++++++
 2 files changed, 11 insertions(+), 4 deletions(-)
 create mode 100644 app_odoo_customize/static/src/xml/base_import.xml

diff --git a/app_odoo_customize/__manifest__.py b/app_odoo_customize/__manifest__.py
index 8f4f9c70..62c4187a 100644
--- a/app_odoo_customize/__manifest__.py
+++ b/app_odoo_customize/__manifest__.py
@@ -23,7 +23,7 @@
 
 {
     'name': 'odoo18 Tweak,Ai Employee,Boost,Customize All in One. Customize,UI,Boost,Security,Data,Development Enhance',
-    'version': '18.0.24.12.16',
+    'version': '18.0.24.12.20',
     'author': 'odooai.cn',
     'category': 'Extra Tools',
     'website': 'https://www.odooai.cn',
@@ -50,7 +50,6 @@
         'security/res_groups.xml',
         'security/ir.model.access.csv',
         'views/app_odoo_customize_views.xml',
-        'views/app_theme_config_settings_views.xml',
         'views/res_config_settings_views.xml',
         'views/ir_views.xml',
         'views/ir_module_module_views.xml',
@@ -75,11 +74,10 @@
             'app_odoo_customize/static/src/js/user_menu.js',
             'app_odoo_customize/static/src/js/ribbon.js',
             'app_odoo_customize/static/src/js/dialog.js',
-            'app_odoo_customize/static/src/js/navbar.js',
+            'app_odoo_customize/static/src/js/base_import_list_renderer.js',
             'app_odoo_customize/static/src/webclient/*.js',
             'app_odoo_customize/static/src/webclient/user_menu.xml',
             'app_odoo_customize/static/src/xml/res_config_edition.xml',
-            'app_odoo_customize/static/src/xml/debug_templates.xml',
             'app_odoo_customize/static/src/xml/base_import.xml',
         ],
     },
diff --git a/app_odoo_customize/static/src/xml/base_import.xml b/app_odoo_customize/static/src/xml/base_import.xml
new file mode 100644
index 00000000..fe0b9b5e
--- /dev/null
+++ b/app_odoo_customize/static/src/xml/base_import.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates xml:space="preserve">
+<!--    todo: 当前无效-->
+<!--	<t t-inherit="base_import.ImportAction" t-inherit-mode="extension" owl="1">-->
+<!--		<xpath expr="//DocumentationLink" position="attributes">-->
+<!--            <attribute name="path">'https://www.odooai.cn/documentation/16.0/applications/general/export_import_data.html'</attribute>-->
+<!--        </xpath>-->
+<!--    </t>-->
+</templates>