Merge pull request !9320 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2026-03-05 13:50:31 +00:00
committed by Gitee
2 changed files with 3 additions and 2 deletions
@@ -2270,7 +2270,7 @@ class VacationMealLine(models.Model):
duration = (end_time - start_time).total_seconds() / 3600
rec.duration = duration or ''
rec.reasons = go_approval_id.details
rec.reasons = go_approval_id.reason_application
rec.start_date = start_date
rec.start_time = start_time
rec.end_time = end_time
@@ -4,7 +4,7 @@
<field name="name">vacation.meal.line.tree</field>
<field name="model">vacation.meal.line</field>
<field name="arch" type="xml">
<tree string="误餐情况" create="false" delete="false">
<tree string="误餐情况" create="false">
<header>
<button name="confirm" type="object" string="归档" class="oe_highlight"/>
</header>
@@ -19,6 +19,7 @@
<field name="reasons"/>
<field name="meal"/>
<field name="is_filing" column_invisible="1"/>
<button name="open_record" string="详情" type="object" class="btn-primary"/>
</tree>
</field>
</record>