!10253 !10252 添加功能

Merge pull request !10253 from 李鹏宇/dev
2026-03-26 02:43:59 +00:00
parent 68a8b7983f 2c7e187ee9
commit 86aaa1a70f
2 changed files with 2 additions and 1 deletions
@@ -1348,6 +1348,7 @@ class YuthonVacationReports(models.Model):
                dynamic_previous_year1_val = 0.0 if (
                            rec.valid_date1 and rec.valid_date1 < current_date) else last_month_record.dynamic_previous_year1
                inherit_vals = {
+                    'remain_missed_meals': last_month_record.remain_missed_meals,
                    'leave': last_month_record.leave,
                    'dynamic_previous_year': dynamic_previous_year_val,
                    'dynamic_remainder_year': last_month_record.dynamic_remainder_year,
@@ -148,7 +148,7 @@
        <field name="arch" type="xml">
            <tree string="收款明细" default_order="reconciliation_date desc">
                <field name="reconciliation_date" string="收款日期"/>
-                <field name="delivered1" string="金额"/>
+                <field name="amount" string="金额"/>
                <field name="management_type_id"/>
                <field name="remake"/>
                <field name="lessee_id"/>