添加功能

yuthon_hr_attendance/models/hr_attendance.py

@@ -1289,8 +1289,7 @@ class HrAttendance(models.Model):
                     'absenteeism_card': False
                 })
         go_approval_domain = [
-            ('users_id', '=', employee.user_id.id),
-            ('work_end', '=', True),
+            ('employee_ids', 'in', employee.id),
             ('start_date', '<=', current_date_str),
             ('end_date', '>=', current_date_str)
         ]
@@ -1306,7 +1305,7 @@ class HrAttendance(models.Model):
             workflow = self.env['soong.workflow.record'].search([
                 ('code', '=', go_approval_record.code)
             ], limit=1)
-            if workflow:
+            if workflow and workflow.approve_state == 'end':
                 attendance_recs.write({
                     'workflow_id': workflow.id,
                     'is_workflow': True,

yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml

@@ -783,7 +783,7 @@
         <field name="groups_id" eval="[(4, ref('base.group_system'))]"/>
     </record>
     <record id="all_update_vacation" model="ir.actions.server">
-        <field name="name">更新数据</field>
+        <field name="name">更新初始（1月）数据</field>
         <field name="model_id" ref="yuthon_hr_attendance.model_yuthon_vacation_reports"/>
         <field name="binding_model_id" ref="yuthon_hr_attendance.model_yuthon_vacation_reports"/>
         <field name="state">code</field>