From c1f918d66a8c90f733aa365c03bbe852c5106d07 Mon Sep 17 00:00:00 2001 From: ivan deng Date: Mon, 13 Jan 2020 16:32:48 +0800 Subject: [PATCH] release chinese city to yan --- app_base_chinese/__manifest__.py | 3 +- app_base_chinese/models/__init__.py | 1 - app_base_chinese/views/res_country_views.xml | 28 ------------------- app_hr_ztree/views/hr_views.xml | 4 +-- .../views/mrp_workorder_views.xml | 2 +- app_product_ztree/views/product_views.xml | 4 +-- app_stock_ztree/views/stock_views.xml | 2 +- 7 files changed, 7 insertions(+), 37 deletions(-) delete mode 100644 app_base_chinese/views/res_country_views.xml diff --git a/app_base_chinese/__manifest__.py b/app_base_chinese/__manifest__.py index 02a7d20c..bc751518 100644 --- a/app_base_chinese/__manifest__.py +++ b/app_base_chinese/__manifest__.py @@ -18,7 +18,7 @@ { 'name': "App base chinese,中国化基本模块增强", - 'version': '13.20.01.11', + 'version': '13.20.01.13', 'author': 'Sunpop.cn', 'category': 'Base', 'website': 'https://www.sunpop.cn', @@ -55,7 +55,6 @@ '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', diff --git a/app_base_chinese/models/__init__.py b/app_base_chinese/models/__init__.py index 979406da..5a895e85 100644 --- a/app_base_chinese/models/__init__.py +++ b/app_base_chinese/models/__init__.py @@ -4,7 +4,6 @@ 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/views/res_country_views.xml b/app_base_chinese/views/res_country_views.xml deleted file mode 100644 index a33aa1d3..00000000 --- a/app_base_chinese/views/res_country_views.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - res.country.tree - res.country - - - - - - - - - - app.res.country.form - res.country - - - - - - - - - - diff --git a/app_hr_ztree/views/hr_views.xml b/app_hr_ztree/views/hr_views.xml index 5bafdacf..39d13f8f 100644 --- a/app_hr_ztree/views/hr_views.xml +++ b/app_hr_ztree/views/hr_views.xml @@ -9,7 +9,7 @@ ztree_select - {'ztree_parent_key': 'parent_id','ztree_expend_level': '2', 'ztree_name_field': 'name'} + {'ztree_parent_key': 'parent_id','ztree_expend_level': '1', 'ztree_name_field': 'name'} @@ -21,7 +21,7 @@ ztree_select - {'ztree_parent_key': 'parent_id','ztree_expend_level': '2', 'ztree_name_field': 'name'} + {'ztree_parent_key': 'parent_id','ztree_expend_level': '1', 'ztree_name_field': 'name'} diff --git a/app_mrp_workcenter_chart/views/mrp_workorder_views.xml b/app_mrp_workcenter_chart/views/mrp_workorder_views.xml index 169f51e6..c91e8d3e 100644 --- a/app_mrp_workcenter_chart/views/mrp_workorder_views.xml +++ b/app_mrp_workcenter_chart/views/mrp_workorder_views.xml @@ -7,7 +7,7 @@ - + diff --git a/app_product_ztree/views/product_views.xml b/app_product_ztree/views/product_views.xml index 2119750d..3d80453f 100644 --- a/app_product_ztree/views/product_views.xml +++ b/app_product_ztree/views/product_views.xml @@ -9,7 +9,7 @@ ztree_select - {'ztree_parent_key': 'parent_id','ztree_expend_level': '2', 'ztree_name_field': 'name', 'order': 'name' } + {'ztree_parent_key': 'parent_id','ztree_expend_level': '1', 'ztree_name_field': 'name', 'order': 'name' } @@ -21,7 +21,7 @@ ztree_select - {'ztree_parent_key': 'parent_id','ztree_expend_level': '2', 'order': 'name' } + {'ztree_parent_key': 'parent_id','ztree_expend_level': '1', 'order': 'name' } diff --git a/app_stock_ztree/views/stock_views.xml b/app_stock_ztree/views/stock_views.xml index 643700cf..32fa849c 100644 --- a/app_stock_ztree/views/stock_views.xml +++ b/app_stock_ztree/views/stock_views.xml @@ -9,7 +9,7 @@ ztree_select - {'ztree_parent_key': 'location_id','ztree_expend_level': '2', 'ztree_name_field': 'name'} + {'ztree_parent_key': 'location_id','ztree_expend_level': '1', 'ztree_name_field': 'name'}