From ada4d45c5c45249b1c7f28e057073fbaf286e419 Mon Sep 17 00:00:00 2001
From: ivan deng <guohuadeng@hotmail.com>
Date: Wed, 21 Jul 2021 12:29:45 +0800
Subject: [PATCH] update common

---
 app_base_chinese/__manifest__.py                  |  2 +-
 app_base_chinese/views/res_partner_views.xml      | 11 +++++++++--
 app_odoo_customize/models/res_config_settings.py  |  2 +-
 app_project_superbar/views/project_task_views.xml |  3 ++-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app_base_chinese/__manifest__.py b/app_base_chinese/__manifest__.py
index 3c562cce..2b32d864 100644
--- a/app_base_chinese/__manifest__.py
+++ b/app_base_chinese/__manifest__.py
@@ -18,7 +18,7 @@
 
 {
     'name': "App base chinese，中国化基本模块增强",
-    'version': '13.21.03.22',
+    'version': '13.21.07.13',
     'author': 'Sunpop.cn',
     'category': 'Base',
     'website': 'https://www.sunpop.cn',
diff --git a/app_base_chinese/views/res_partner_views.xml b/app_base_chinese/views/res_partner_views.xml
index 297978e4..10785204 100644
--- a/app_base_chinese/views/res_partner_views.xml
+++ b/app_base_chinese/views/res_partner_views.xml
@@ -54,7 +54,10 @@
                 </xpath>
                 <xpath expr="//field[@name='child_ids']//form[1]//field[@name='street']" position="before">
                     <xpath expr="//field[@name='child_ids']//form[1]//field[@name='zip']" position="move"/>
-                </xpath>                
+                </xpath>
+                <xpath expr="//field[@name='child_ids']//form[1]//field[@name='email']" position="before">
+                    <field name="category_id" widget="many2many_tags"/>
+                </xpath>
                 <!-- res.partner联系人 kanban -->
                 <!-- 显示类型和地址等 -->
                 <xpath expr="//field[@name='child_ids']//kanban[1]//templates//field[@name='name']" position="before">
@@ -62,6 +65,7 @@
                 </xpath>
                 <xpath expr="//field[@name='child_ids']//kanban[1]//templates//field[@name='name']" position="after">
                     <div t-if="record.type and record.type.raw_value"><field name="type"/></div>
+                    <div t-if="record.category_id and record.category_id.raw_value"><field name="category_id" widget="many2many_tags"/></div>
                 </xpath>
             </field>
         </record>
@@ -84,6 +88,9 @@
                 <xpath expr="//field[@name='street']" position="before">
                     <xpath expr="//field[@name='zip']" position="move"/>
                 </xpath>
+                <xpath expr="//field[@name='website']" position="after">
+                    <field name="category_id" widget="many2many_tags"/>
+                </xpath>
             </field>
         </record>
         <!--res.partner open地址中国化 -->
@@ -133,7 +140,7 @@
             <field name="inherit_id" ref="base.view_partner_tree"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='email']" position="after">
-                    <field name="category_id" optional="show"/>
+                    <field name="category_id" widget="many2many_tags" optional="show"/>
                 </xpath>
             </field>
         </record>
diff --git a/app_odoo_customize/models/res_config_settings.py b/app_odoo_customize/models/res_config_settings.py
index ad642e4b..cc218e3f 100644
--- a/app_odoo_customize/models/res_config_settings.py
+++ b/app_odoo_customize/models/res_config_settings.py
@@ -140,7 +140,7 @@ class ResConfigSettings(models.TransientModel):
                     _logger.warning('remove_app_data where add company_id: %s' % obj_name)
             try:
                 self._cr.execute(sql)
-                # self._cr.commit()
+                self._cr.commit()
             except Exception as e:
                 _logger.warning('remove data error: %s,%s', line, e)
         # 更新序号
diff --git a/app_project_superbar/views/project_task_views.xml b/app_project_superbar/views/project_task_views.xml
index d8d68546..dc25152e 100644
--- a/app_project_superbar/views/project_task_views.xml
+++ b/app_project_superbar/views/project_task_views.xml
@@ -9,8 +9,9 @@
       <xpath expr="//search" position="inside">
         <searchpanel view_types="kanban,tree,graph,pivot">
           <field name="project_id"/>
+          <field name="stage_id" select="multi"/>
+          <field name="tag_ids" select="multi"/>
           <field name="user_id"/>
-          <field name="stage_id"/>
         </searchpanel>
       </xpath>
     </field>