diff --git a/app_base_chinese/__manifest__.py b/app_base_chinese/__manifest__.py
index 0cb8799f..02a7d20c 100644
--- a/app_base_chinese/__manifest__.py
+++ b/app_base_chinese/__manifest__.py
@@ -18,7 +18,7 @@
{
'name': "App base chinese，中国化基本模块增强",
- 'version': '13.19.12.24',
+ 'version': '13.20.01.11',
'author': 'Sunpop.cn',
'category': 'Base',
'website': 'https://www.sunpop.cn',
@@ -42,9 +42,9 @@
6. 修正产品类别的列表及m2o字段中不显示中文目录名的Bug
7. 修正仓库位置的列表及m2o字段中不显示中文目录名的Bug
8. 超级用户改时区为 中国
- 9. 时间格式年月日为 2019-12-30，时间为 22:10
- 11. todo:中文演示数据(只有demo模式才加载)
-
+ 9. 时间格式年月日为 2019-12-30，时间为 22:10
+ 10. 国家增加排序，中国排第一
+ 11. todo:中文演示数据(只有demo模式才加载)
""",
'pre_init_hook': 'pre_init_hook',
'post_init_hook': 'post_init_hook',
@@ -55,8 +55,10 @@
'images': ['static/description/banner.jpg'],
'data': [
'views/res_partner_views.xml',
+ 'views/res_country_views.xml',
'views/res_currency_views.xml',
'views/ir_default_views.xml',
+ 'views/templates.xml',
'data/ir_default_data.xml',
'data/ir_sequence_data.xml',
'data/base_data.xml',
diff --git a/app_base_chinese/hooks.py b/app_base_chinese/hooks.py
index a4fe4c6c..7b268bb0 100644
--- a/app_base_chinese/hooks.py
+++ b/app_base_chinese/hooks.py
@@ -44,6 +44,9 @@ def post_init_hook(cr, registry):
('id', '=', 2)
])
ids.write({'tz': "Asia/Shanghai"})
+ # 中国排序第一
+ ids = env.ref('base.cn')
+ ids.write({'sequence': 1})
except Exception as e:
raise Warning(e)
diff --git a/app_base_chinese/models/__init__.py b/app_base_chinese/models/__init__.py
index 5a895e85..979406da 100644
--- a/app_base_chinese/models/__init__.py
+++ b/app_base_chinese/models/__init__.py
@@ -4,6 +4,7 @@ from . import res_partner
from . import res_currency
from . import product_category
from . import stock_location
+from . import res_country
diff --git a/app_base_chinese/models/res_country.py b/app_base_chinese/models/res_country.py
new file mode 100644
index 00000000..d0cf4869
--- /dev/null
+++ b/app_base_chinese/models/res_country.py
@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import fields, models
+
+
+class Country(models.Model):
+ _inherit = 'res.country'
+ _order = 'sequence,name'
+
+ sequence = fields.Integer('Sequence', help="Determine the display order", default=99)
diff --git a/app_base_chinese/static/src/scss/app_style.scss b/app_base_chinese/static/src/scss/app_style.scss
new file mode 100644
index 00000000..39bfb17d
--- /dev/null
+++ b/app_base_chinese/static/src/scss/app_style.scss
@@ -0,0 +1,26 @@
+.o_form_view .o_address_format {
+ .o_address_country {
+ display: -webkit-inline-flex;
+ display: inline-flex;
+ width: 48%;
+ margin-right: 2%;
+ }
+}
+.o_form_view.o_form_editable .o_address_format {
+ div.o_address_state {
+ width: 50%;
+ margin-right: 0;
+ }
+ .o_address_city{
+ width: 48%;
+ margin-right: 2%;
+ }
+ .o_address_city_id{
+ width: 48%;
+ margin-right: 2%;
+ }
+ input.o_address_zip{
+ width: 50%;
+ margin-right: 0;
+ }
+}
diff --git a/app_base_chinese/views/res_country_views.xml b/app_base_chinese/views/res_country_views.xml
new file mode 100644
index 00000000..a33aa1d3
--- /dev/null
+++ b/app_base_chinese/views/res_country_views.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+ res.country.tree
+ res.country
+
+
+
+
+
+
+
+
+
+ app.res.country.form
+ res.country
+
+
+
+
+
+
+
+
+
+
diff --git a/app_base_chinese/views/templates.xml b/app_base_chinese/views/templates.xml
new file mode 100644
index 00000000..dd348f61
--- /dev/null
+++ b/app_base_chinese/views/templates.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/app_web_fullwidth/views/template_view.xml b/app_web_fullwidth/views/template_view.xml
index 7a21f654..9dcdb9af 100644
--- a/app_web_fullwidth/views/template_view.xml
+++ b/app_web_fullwidth/views/template_view.xml
@@ -1,10 +1,10 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/web_fontawesome/__manifest__.py b/web_fontawesome/__manifest__.py
index 4f984075..d3e53f84 100644
--- a/web_fontawesome/__manifest__.py
+++ b/web_fontawesome/__manifest__.py
@@ -42,5 +42,5 @@
'templates/assets.xml',
],
'installable': True,
- 'auto_install': True,
+ 'auto_install': False,
}