!8190 !8189 添加功能

Merge pull request !8190 from 李鹏宇/dev

room/security/ir_rule.xml

@@ -11,11 +11,6 @@
         <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_issue/models/inherit_room_booking.py

@@ -10,6 +10,24 @@ class RoomBooking(models.Model):
     issue_meeting_line_ids = fields.One2many('issue.meeting.line', 'meeting_booking_id', string="关联议题明细行")
     number_of_meetings = fields.Integer(string='会议次数')
     minutes_id = fields.Many2one('issue.meeting.minutes', string='会议纪要流程')
+    is_company = fields.Boolean(string="本公司", default=True, compute='_compute_is_company',
+                                search='_search_part_of_company')
+
+    @api.depends_context('uid', 'company')
+    @api.depends('company_id')
+    def _compute_is_company(self):
+        active_company_ids = self.env.companies
+        for employee in self:
+            employee.is_company = employee.company_id in active_company_ids
+
+    def _search_part_of_company(self, operator, value):
+        company_ids = self.env.companies.ids
+        if not value:
+            operator = '!=' if operator == '=' else '='
+        if operator == '=':
+            return [('company_id', 'in', company_ids)]
+        else:
+            return [('company_id', 'not in', company_ids)]
 
     @api.depends('number_of_meetings', 'meeting_type_id', 'start_datetime')
     def _compute_name(self):

yuthon_issue/models/issue_approval.py

@@ -38,6 +38,23 @@ class IssueApproval(models.Model):
         return self._description if self._description else self._name
 
     name_title = fields.Char(default=_get_default_name_title)
+    is_company = fields.Boolean(string="本公司", default=True, compute='_compute_is_company',search='_search_part_of_company')
+
+    @api.depends_context('uid', 'company')
+    @api.depends('company_id')
+    def _compute_is_company(self):
+        active_company_ids = self.env.companies
+        for employee in self:
+            employee.is_company = employee.company_id in active_company_ids
+
+    def _search_part_of_company(self, operator, value):
+        company_ids = self.env.companies.ids
+        if not value:
+            operator = '!=' if operator == '=' else '='
+        if operator == '=':
+            return [('company_id', 'in', company_ids)]
+        else:
+            return [('company_id', 'not in', company_ids)]
 
     @api.depends('code')
     def _compute_workflow(self):

yuthon_issue/security/issue_security_group.xml

@@ -23,9 +23,4 @@
         <field name="model_id" ref="model_issue_library"/>
         <field name="domain_force">[('company_id', 'in', company_ids)]</field>
     </record>
-    <record model="ir.rule" id="issue_approval_rule">
-        <field name="name">议题审批多公司</field>
-        <field name="model_id" ref="model_issue_approval"/>
-        <field name="domain_force">[('company_id', 'in', company_ids)]</field>
-    </record>
 </odoo>

yuthon_issue/views/inherit_room_booking.xml

@@ -35,12 +35,10 @@
             </xpath>
         </field>
     </record>
-
     <record id="issue_meeting_action" model="ir.actions.act_window">
         <field name="name">议题相关会议</field>
         <field name="res_model">room.booking</field>
         <field name="view_mode">tree,form</field>
-        <field name="domain">[('is_issue','=',True)]</field>
+        <field name="domain">[('is_issue','=',True), ('is_company','=',True)]</field>
     </record>
-
 </odoo>

yuthon_issue/views/issue_approval_views.xml

@@ -99,6 +99,7 @@
 
     <record id="issue_library_approval_action" model="ir.actions.act_window">
         <field name="name">议题审批</field>
+        <field name="domain">[('is_company','=',True)]</field>
         <field name="res_model">issue.approval</field>
         <field name="view_mode">tree,form</field>
     </record>