Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang

2026-02-05 15:13:22 +08:00
parent fb2aa70fea aa3307cf91
commit a1357f7f5a
3 changed files with 3 additions and 2 deletions
@@ -67,6 +67,6 @@ class InheritHrLeave(models.Model):
                ('date_from', '<=', end_of_year),
                ('state', '=', 'validate'),
            ])
-            total_days = sum(leave.number_of_days for leave in leave_records)
+            total_days = sum(leave.length_leave for leave in leave_records)
            leave_type_name = record.holiday_status_id.name
            record.leave_stats = f"本年内已请{leave_type_name}{total_days:.1f}天"
@@ -12,7 +12,7 @@
                <field name="date_from"/>
                <field name="date_to"/>
                <field name="length_leave" string="请假时长(天)"/>
-                <field name="leave_stats"/>
+                <field name="leave_stats" column_invisibe="1"/>
                <field name="application_reason"/>
                <field name="state"/>
                <field name="is_filing" column_invisibe="1"/>
@@ -80,6 +80,7 @@
        <field name="model">issue.approval.decision</field>
        <field name="arch" type="xml">
            <search>
+                <field name="specifics"/>
                <group expand="1">
                    <filter name="group_decision_type_on_id" string="事项类别上级"
                            context="{'group_by': 'decision_type_on_id'}"/>