添加功能

yuthon_contract/models/inherit_hr_contract.py

@@ -110,6 +110,8 @@ class HrContract(models.Model):
             'view_mode': 'form',
             'target': 'current',
             'context': {
+                'default_work_end': False,
+                'default_self_users_ids':[(6, 0, [self.employee_id.user_id.id])],
                 'default_contract_id': contract_ids.id,
                 'default_employee_id': contract_ids.employee_id.id
         }}

yuthon_hr_employee_approval/models/yuthon_employee_add.py

@@ -60,8 +60,12 @@ class YuthonEmployeeAdd(models.Model):
     @api.depends('contract_id', 'version')
     def _compute_name(self):
         for rec in self:
+            version_str = self.contract_id.version.lstrip('V')
+            main_version = version_str.split('.')[0]
+            new_main_version = int(main_version) + 1
+            new_version = f"V{new_main_version}.0"
             if rec.contract_id:
-                rec.name = rec.contract_id.name + ' ' + rec.version
+                rec.name = rec.contract_id.name + ' ' + new_version
             else:
                 rec.name = None
 

yuthon_purchase/models/inherit_purchase_order.py

@@ -15,11 +15,10 @@ class InheritPurchaseOrder(models.Model):
         store=True
     )
     code = fields.Char(string="流水号", default=lambda self: self.env['ir.sequence'].next_by_code('purchase_workflow_approval_code'))
-    state = fields.Selection(selection_add=[('申请人', '申请人'),
-                                            ('部门经理', '部门经理'),
+    state = fields.Selection(selection_add=[('部门经理', '部门经理'),
                                             ('协办', '协办'),
                                             ('分管领导', '分管领导'),
-                                            ('总经理', '总经理')] ,default='申请人')
+                                            ('总经理', '总经理')], default='draft')
     work_end = fields.Boolean(string="结束")
     user_id = fields.Many2one('res.users', string="申请人", default=lambda self: self.env.user)
     company_id = fields.Many2one(related='user_id.employee_ids.company_id', string="公司")