!8836 添加功能

Merge pull request !8836 from 李鹏宇/dev_zhou

yuthon_hr_attendance/models/yuthon_overtime_line.py

@@ -186,7 +186,7 @@ class YuthonOvertimeLine(models.Model):
 
     @api.model
     def carryover_details(self):
-        domain = [('vacation_sum', '>', 40),
+        domain = [('vacation_sum', '>', 40.1),
                   ('remaining_quantity', '!=', 0.0)
                   ]
         overtime_lines = self.env['yuthon.overtime.line'].search(domain)

yuthon_hr_attendance/models/yuthon_vacation_reports.py

@@ -1470,7 +1470,8 @@ class YuthonVacationReports(models.Model):
                     '&', ('workflow_record_id', '!=', False),
                     '&', ('start_time', '>=', dec_2025_end),
                     '&', ('vacation_id', '!=', False),
-                    ('start_time', '<=', current_date)
+                    ('start_time', '<=', current_date),
+                    ('employee_id.is_annual_salary', '!=', True)
                 ]
             else:
                 domain = [
@@ -1481,9 +1482,6 @@ class YuthonVacationReports(models.Model):
                 ]
         all_records = self.env['vacation.over.line'].search(domain)
         over_lines = all_records.filtered(lambda r: abs(r.remaining_quantity) > 1e-6)
-        if not over_lines:
-            return
-
         employee_summary = {}
         for line in over_lines:
             emp_id = line.employee_id.id
@@ -1549,7 +1547,8 @@ class YuthonVacationReports(models.Model):
                 '&', ('workflow_record_id', '!=', False),
                 '&', ('start_time', '>=', dec_2025_end),
                 '&', ('vacation_id', '!=', False),
-                ('start_time', '<=', current_date)
+                ('start_time', '<=', current_date),
+                ('employee_id.is_annual_salary', '!=', True)
             ]
         else:
             domain = [
@@ -1560,9 +1559,6 @@ class YuthonVacationReports(models.Model):
             ]
         all_records = self.env['vacation.over.line'].search(domain)
         over_lines = all_records.filtered(lambda r: abs(r.remaining_quantity) > 1e-6)
-        if not over_lines:
-            return
-
         employee_summary = {}
         for line in over_lines:
             emp_id = line.employee_id.id
@@ -1626,7 +1622,8 @@ class YuthonVacationReports(models.Model):
                 '&', ('workflow_record_id', '!=', False),
                 '&', ('start_time', '>=', dec_2025_end),
                 '&', ('vacation_id', '!=', False),
-                ('start_time', '<', current_month_first_dt)
+                ('start_time', '<', current_month_first_dt),
+                ('employee_id.is_annual_salary', '!=', True)
             ]
         else:
             domain = [
@@ -1638,9 +1635,6 @@ class YuthonVacationReports(models.Model):
 
         all_records = self.env['vacation.over.line'].search(domain)
         over_lines = all_records.filtered(lambda r: abs(r.remaining_quantity) > 1e-6)
-        if not over_lines:
-            return
-
         employee_summary = {}
         for line in over_lines:
             emp_id = line.employee_id.id

yuthon_hr_attendance/static/src/xml/button_overtime_active_export.xml

@@ -3,7 +3,7 @@
     <t t-name="overtime_active_export_module.ListView.Buttons" t-inherit="web.ListView.Buttons">
         <xpath expr="//div[hasclass('o_list_buttons')]" position="after">
             <button type="button" class="btn btn-success" style="margin-left: 10px;" t-on-click="exportOvertimeActiveExcel">
-                导出加班归档明细
+                导出
             </button>
         </xpath>
     </t>

yuthon_hr_attendance/wizard/export_date_wizard.py

@@ -213,7 +213,7 @@ class ExportDateWizard(models.TransientModel):
         """导出加班归档明细"""
         active_ids = json.loads(self.active_ids) if self.active_ids else []
         
-        domain = [('carry_forward_date', '>=', start_date), ('carry_forward_date', '<', end_date), ('is_void','=', False)]
+        domain = [('carry_forward_date', '>=', start_date), ('carry_forward_date', '<', end_date), ('is_void','=', False), ('carry_forward_quantity', '>', 0)]
         if active_ids:
             domain = [('id', 'in', active_ids)] + domain