pengyuthon/gzth
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!5188 添加功能

Browse Source 
Merge pull request !5188 from 李鹏宇/zhou
This commit is contained in:
李鹏宇
2025-09-17 01:50:06 +00:00
committed by Gitee
parent f9da0cb09e 9e026c178c
commit 862e8ac163
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_property_approval/views/inherit_yuthon_property_views.xml
+5
View File
@@ -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">
yuthon_salary/wizard/salary_compute_wizard.py
+1 -1
View File
@@ -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)]