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

!1176 1

Browse Source 
Merge pull request !1176 from dev_ljm_20241129
This commit is contained in:
ljm
2025-01-07 09:09:41 +00:00
committed by Gitee
parent 180a13777e f52438b0e8
commit d68632286e
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_property_approval/models/property_lease_contract.py
+11 -12
View File
@@ -371,16 +371,15 @@ class PropertyLeaseContract(models.Model):
free_start = start_date # 免租期开始
if rent_free_period_month:
free_start = start_date + relativedelta(months=rent_free_period_month)
self.sudo().write({'breakdown_ids': [(0, 0, {
"unit_price": unit_price,
"monthly_amount": monthly_amount,
"breakdown_id": self.id,
"start_data": start_date,
"end_data": free_start - relativedelta(days=1),
"month_number": rent_free_period_month,
"period_rent": 0,
})]})
self.sudo().write({'breakdown_ids': [(0, 0, {
"unit_price": unit_price,
"monthly_amount": monthly_amount,
"breakdown_id": self.id,
"start_data": start_date,
"end_data": free_start - relativedelta(days=1),
"month_number": rent_free_period_month,
"period_rent": 0,
})]})
# 如果没有递增 那么计算全部
if not increments_every_few_years:
# 如果免租期有天那么默认增加一个月
@@ -420,9 +419,9 @@ class PropertyLeaseContract(models.Model):
else:
first_years_begin_end = start_date
# 免递增年份计算
if first_years_begin:
if first_years_begin > 1:
# 免递增结束时间
first_years_begin_end = start_date + relativedelta(months=first_years_begin * 12)
first_years_begin_end = start_date + relativedelta(months=(first_years_begin -1) * 12)
# 免租期结束时间 free_start
# 计算免租期和免增期的差值, 如果免租期超过免增期那么不存在免增期
if first_years_begin_end > free_start: