From 9e026c178c538aa47f02ae3b5977d9b91a1ea190 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Wed, 17 Sep 2025 09:49:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/inherit_yuthon_property_views.xml                  | 5 +++++
 yuthon_salary/wizard/salary_compute_wizard.py                | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

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 @@
             <xpath expr="//tree" position="inside">
                 <header>
                     <button name="batch_push_rent" type="object" string="推送" class="oe_highlight"/>
+                    <button name="unlink" string="删除" type="object" icon="fa-trash" groups="base.group_system" confirm="确定要删除选中的记录吗？"/>
                 </header>
             </xpath>
             <xpath expr="//field[@name='property_id']" position="before">
@@ -89,6 +90,7 @@
             <xpath expr="//tree" position="inside">
                     <header>
                         <button name="batch_push_deposit" type="object" string="推送" class="oe_highlight"/>
+                        <button name="unlink" string="删除" type="object" icon="fa-trash" groups="base.group_system" confirm="确定要删除选中的记录吗？"/>
                     </header>
             </xpath>
             <xpath expr="//field[@name='property_id']" position="after">
@@ -170,6 +172,7 @@
             <xpath expr="//tree" position="inside">
                 <header>
                     <button name="batch_push_tariff" type="object" string="推送" class="oe_highlight"/>
+                    <button name="unlink" string="删除" type="object" icon="fa-trash" groups="base.group_system" confirm="确定要删除选中的记录吗？"/>
                 </header>
             </xpath>
             <xpath expr="//field[@name='property_id']" position="before">
@@ -211,6 +214,7 @@
             <xpath expr="//tree" position="inside">
                 <header>
                     <button name="batch_push_water" type="object" string="推送" class="oe_highlight"/>
+                    <button name="unlink" string="删除" type="object" icon="fa-trash" groups="base.group_system" confirm="确定要删除选中的记录吗？"/>
                 </header>
             </xpath>
             <xpath expr="//field[@name='property_id']" position="before">
@@ -235,6 +239,7 @@
             <xpath expr="//tree" position="inside">
                 <header>
                     <button name="batch_push_management" type="object" string="推送" class="oe_highlight"/>
+                    <button name="unlink" string="删除" type="object" icon="fa-trash" groups="base.group_system" confirm="确定要删除选中的记录吗？"/>
                 </header>
             </xpath>
             <xpath expr="//field[@name='lessee_id']" position="before">
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)]