!9583 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen-data/gzth">https://gitee.com/jinan-pengyusen-data/gzth</a> into dev_wang

Merge pull request !9583 from 李鹏宇/dev_wang

yuthon_official/__manifest__.py

@@ -22,6 +22,7 @@
         'views/yuthon_official_labor_views.xml',
         'views/yuthon_official_incoming_labor_views.xml',
         'views/yuthon_official_party_views.xml',
+        'views/yuthon_official_branch_party_views.xml',
         'views/yuthon_file_processing_views.xml',
         'views/yuthon_sub_enterprises_view.xml',
         'views/yuthon_official_incoming_party_views.xml',

yuthon_official/models/__init__.py

@@ -5,6 +5,7 @@ from . import official_partner
 from . import officical_type
 from . import yuthon_official_labor
 from . import yuthon_official_party
+from . import yuthon_official_branch_party
 from . import yuthon_offficial_incoming_party
 from . import yuthon_official_incoming_labor
 from . import yuthon_official_incoming_normal

yuthon_official/models/yuthon_official_party.py

@@ -5,7 +5,7 @@ from odoo.exceptions import ValidationError, UserError
 
 class YuthonOfficialParty(models.Model):
     _name = 'yuthon.official.party'
-    _description = '党支委发文'
+    _description = '党总支发文'
     _inherit = ['mail.thread.main.attachment', 'mail.activity.mixin', 'soong.workflow.mixin']
     _rec_name = 'name'
 

yuthon_official/security/ir.model.access.csv

@@ -4,6 +4,7 @@ access_official_partner,official_partner,model_official_partner,base.group_user,
 access_official_type,official_type,model_official_type,base.group_user,1,1,1,1
 access_yuthon_official_labor,yuthon_official_labor,model_yuthon_official_labor,base.group_user,1,1,1,1
 access_yuthon_official_party,yuthon_official_party,model_yuthon_official_party,base.group_user,1,1,1,1
+access_yuthon_official_branch_party,yuthon_official_branch_party,model_yuthon_official_branch_party,base.group_user,1,1,1,1
 access_yuthon_official_incoming_party,yuthon_official_incoming_party,model_yuthon_official_incoming_party,base.group_user,1,1,1,1
 access_yuthon_official_incoming_labor,yuthon_official_incoming_labor,model_yuthon_official_incoming_labor,base.group_user,1,1,1,1
 access_yuthon_official_incoming_normal,yuthon_official_incoming_normal,model_yuthon_official_incoming_normal,base.group_user,1,1,1,1

yuthon_official/views/official_menus.xml

@@ -45,9 +45,15 @@
     <menuitem
             id="yuthon_official_party"
             parent="yuthon_official_party_management_menu"
-            name="党支委发文"
+            name="党总支发文"
             action="yuthon_official_party_action"
             sequence="20"/>
+    <menuitem
+            id="yuthon_official_branch_party"
+            parent="yuthon_official_party_management_menu"
+            name="党支委发文"
+            action="yuthon_official_branch_party_action"
+            sequence="25"/>
     <menuitem
             id="yuthon_official_incoming_labor"
             parent="yuthon_official_labor_management_menu"

yuthon_official/views/yuthon_official_party_views.xml

@@ -102,7 +102,7 @@
     </record>
 
     <record id="yuthon_official_party_action" model="ir.actions.act_window">
-        <field name="name">党支委发文</field>
+        <field name="name">党总支发文</field>
         <field name="domain">[('is_company', '=', True)]</field>
         <field name="res_model">yuthon.official.party</field>
         <field name="view_mode">tree,form</field>