!5541 !5540 添加功能

Merge pull request !5541 from 李鹏宇/dev

yuthon_hr_employee_approval/models/yuthon_onboard_approval.py

@@ -88,11 +88,19 @@ class YuthonOnboardApproval(models.Model):
         else:
             self.duration_employment_end = False
 
-
     @api.onchange('employee_name_id', 'job_id', 'department_id1')
     def _onchange_name(self):
-        if self.employee_name_id and self.job_id and self.department_id1:
-            self.name = self.employee_name_id.name + '-' + self.job_id.name + '-' + self.department_id1.name
+        name_parts = []
+        if self.employee_name_id:
+            name_parts.append(self.employee_name_id.name)
+        if self.job_id:
+            name_parts.append(self.job_id.name)
+        if self.department_id1:
+            name_parts.append(self.department_id1.name)
+        if name_parts:
+            self.name = '-'.join(name_parts)
+        else:
+            self.name = False
 
     @api.onchange('structure_type_id')
     def _onchange_structure_type_id(self):

yuthon_hr_employee_approval/models/yuthon_renewal_approval.py

@@ -22,7 +22,7 @@ class YuthonRenewalApproval(models.Model):
 
     employee_id = fields.Many2one('hr.employee', string="续签员工")
     card = fields.Char(related='employee_id.identification_id', string="身份证号")
-    department1_id = fields.Many2one(related='employee_id.department_id', string="续签部门")
+    department1_id = fields.Many2one(string="续签部门")
     user_sex = fields.Selection(related='employee_id.user_sex', string="性别")
     degree = fields.Char(related='employee_id.high_degree', string="学历")
     onboard_time = fields.Date(related='employee_id.contract_id.date_end', string='入职时间')

yuthon_property_approval/models/inherit_yuthon_property.py

@@ -401,6 +401,7 @@ class PropertyAccountsReceivable(models.Model):
     lessee_id = fields.Many2one(related='contract_id.lessee_id', string='承租方', store=True)
     company_id = fields.Many2one(related='contract_id.lessor_id', string="出租方公司", store=True)
     company_id1 = fields.Many2one(related='contract_id.admin_id.company_id', string="管理员公司", store=True)
+    company_id2 = fields.Many2one("res.company", string="公司", compute='_compute_company_id2', store=True)
     contract_id = fields.Many2one('property.lease.contract', string="关联租赁合同审批")
     admin_id = fields.Many2one(related='contract_id.admin_id', string="片区管理员", store=True)
     tenure_type = fields.Selection(related='contract_id.tenure_type', string="权属类型", store=True)
@@ -421,6 +422,19 @@ class PropertyAccountsReceivable(models.Model):
 
     actual_coping = fields.Float(string="实际应付", compute='_compute_actual_coping', store=True)
 
+    @api.depends('company_id')
+    def _compute_company_id2(self):
+        for rec in self:
+            if rec.company_id:
+                if rec.company_id.referred == '天河物管':
+                    company = self.env['res.company'].search([('name', '=', '天河物管')], limit=1)
+                    rec.company_id2 = company.id if company else False
+                elif rec.company_id.referred in ('天河投资', '天投城建'):
+                    company = self.env['res.company'].search([('name', '=', '集团本部')], limit=1)
+                    rec.company_id2 = company.id if company else False
+            else:
+                rec.company_id2 = False
+
     @api.depends('original_amount', 'pre_collection')
     def _compute_actual_coping(self):
         for record in self:

yuthon_property_approval/security/property_group.xml

@@ -3,6 +3,6 @@
     <record model="ir.rule" id="accounts_receivable_rule">
         <field name="name">应收账单多公司</field>
         <field name="model_id" ref="model_property_accounts_receivable"/>
-        <field name="domain_force">[('company_id1', 'in', company_ids)]</field>
+        <field name="domain_force">[('company_id2', 'in', company_ids)]</field>
     </record>
 </odoo>