From 58c489100b5650e5993b913e804f7532febb52ff 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: Tue, 16 Sep 2025 14:42:13 +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/property_lease_contract.xml | 1 +
.../wizard/property_rental_wizard.py | 22 -------------------
yuthon_salary/wizard/salary_compute_wizard.py | 4 ++--
3 files changed, 3 insertions(+), 24 deletions(-)
diff --git a/yuthon_property_approval/views/property_lease_contract.xml b/yuthon_property_approval/views/property_lease_contract.xml
index 6b317a7e3..d409b2f9f 100644
--- a/yuthon_property_approval/views/property_lease_contract.xml
+++ b/yuthon_property_approval/views/property_lease_contract.xml
@@ -99,6 +99,7 @@
+
diff --git a/yuthon_property_approval/wizard/property_rental_wizard.py b/yuthon_property_approval/wizard/property_rental_wizard.py
index 338ee52d5..8de00717a 100644
--- a/yuthon_property_approval/wizard/property_rental_wizard.py
+++ b/yuthon_property_approval/wizard/property_rental_wizard.py
@@ -60,28 +60,6 @@ class PropertyRentalWizard(models.Model):
"year": self.select_year,
"month": self.select_month,
})
- if not rent_id:
- self.sudo().env["property.rent.list"].create({
- "contract_id": record.id,
- "due_date": start_date,
- 'multiplier':multiplier,
- "lessee_id": record.lessee_id.id,
- "property_id": property_id,
- "original_amount": rent_amount,
- "year": self.select_year,
- "month": self.select_month,
- })
- else:
- rent_id.write({
- "contract_id": record.id,
- "due_date": start_date,
- 'multiplier': multiplier,
- "lessee_id": record.lessee_id.id,
- "property_id": property_id,
- "original_amount": rent_amount,
- "year": self.select_year,
- "month": self.select_month,
- })
def create_water_fee_list(self, record):
"""封装创建水费记录的逻辑"""
diff --git a/yuthon_salary/wizard/salary_compute_wizard.py b/yuthon_salary/wizard/salary_compute_wizard.py
index 74582104f..958cf637b 100644
--- a/yuthon_salary/wizard/salary_compute_wizard.py
+++ b/yuthon_salary/wizard/salary_compute_wizard.py
@@ -55,8 +55,8 @@ class SalaryComputeWizard(models.Model):
('contract_id.termination_date', '=', False),
('contract_id.date_end', '=', False)
])
- # self.employee_ids = [(6, 0, employees.ids)]
- # self.employee_number = len(employees)
+ self.employee_ids = [(6, 0, employees.ids)]
+ self.employee_number = len(employees)
# for employee in employees:
# print(f"员工姓名: {employee.name}")