diff --git a/yuthon_property_approval/views/inherit_yuthon_property_views.xml b/yuthon_property_approval/views/inherit_yuthon_property_views.xml index d659f26e3..7fde1cff9 100644 --- a/yuthon_property_approval/views/inherit_yuthon_property_views.xml +++ b/yuthon_property_approval/views/inherit_yuthon_property_views.xml @@ -58,6 +58,7 @@
@@ -89,6 +90,7 @@
@@ -170,6 +172,7 @@
@@ -211,6 +214,7 @@
@@ -235,6 +239,7 @@
diff --git a/yuthon_salary/wizard/salary_compute_wizard.py b/yuthon_salary/wizard/salary_compute_wizard.py index 958cf637b..c0cb142e9 100644 --- a/yuthon_salary/wizard/salary_compute_wizard.py +++ b/yuthon_salary/wizard/salary_compute_wizard.py @@ -147,7 +147,7 @@ class SalaryComputeWizard(models.Model): # 加班时长 employee.last_month_overtime = vacation_report.done_working_overtime employee.last_attendance = vacation_report.should_attendance == vacation_report.actual_attendance - + employee.meal_number = vacation_report.meal_number employee.salary_date = start_date employee.salary_month = self.select_time employee.salary_year_jin_ids = [(6, 0, self.employee_ids.ids)]