!7264 !7263 添加功能

Merge pull request !7264 from 李鹏宇/dev

room/security/ir_rule.xml

@@ -11,6 +11,11 @@
         <field name="model_id" ref="model_room_room"/>
         <field name="domain_force">[('company_id', 'in', company_ids)]</field>
     </record>
+    <record model="ir.rule" id="room_booking_rule">
+        <field name="name">预定会议多公司</field>
+        <field name="model_id" ref="model_room_booking"/>
+        <field name="domain_force">[('company_id', 'in', company_ids)]</field>
+    </record>
 <!--    <record id="room_room_comp_rule" model="ir.rule">-->
 <!--        <field name="name">Room Room MC Rule</field>-->
 <!--        <field name="model_id" ref="model_room_room"/>-->

yuthon_maintain/models/property_device_repair.py

@@ -52,7 +52,7 @@ class PropertyDeviceRelief(models.Model):
         }
 
     def get_no_read_count(self):
-        return self.search_count([('report_state', '=', 'to')])
+        return self.search_count([('report_state', '=', 'to'), ('users_id', '=', self.env.user.id)])
 
     def pull_order(self):
         soong_workflow_line_list = []

yuthon_maintain/views/property_device_repair_views.xml

@@ -66,4 +66,9 @@
         <field name="domain">[('users_id', '=', uid)]</field>
         <field name="view_mode">tree,form</field>
     </record>
+    <record id="property_device_repair_all_action" model="ir.actions.act_window">
+        <field name="name">报事报修(管理员）</field>
+        <field name="res_model">property.device.repair</field>
+        <field name="view_mode">tree,form</field>
+    </record>
 </odoo>

yuthon_work_brand/views/hr_menus.xml

@@ -707,7 +707,12 @@
               name="报事报修"
               action="yuthon_maintain.property_device_repair_action"
               sequence="5"/>
-
+    <menuitem id="property_device_repair_action_brand"
+              parent="holiday_manage_menu_root_board"
+              name="报事报修（管理员）"
+              action="yuthon_maintain.property_device_repair_all_action"
+              groups="base.group_system"
+              sequence="5"/>
     <menuitem id="yuthon_notice_menu1_board"
               parent="holiday_manage_menu_root_board"
               name="通知公告"