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

!1237 结束

Browse Source 
Merge pull request !1237 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2025-01-09 06:57:39 +00:00
committed by Gitee
parent 6114cfee3b 2b28f3a97a
commit 53ebc28ef3
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_property_approval/models/property_lease_contract.py
+16 -16
View File
@@ -360,17 +360,17 @@ class PropertyLeaseContract(models.Model):
record.write({'breakdown_ids': [(5, 0, 0)]})
start_date = record.term_start_time
end_date = record.term_end_time + relativedelta(days=1)
record.do_generate_details_core(start_date, end_date)
record.do_generate_details_core(True, start_date, end_date)
# 计算首年租金
first_year_end_date = start_date + relativedelta(months=12)
if first_year_end_date > end_date:
first_year_end_date = end_date
all_period_rent = record.do_generate_details_core(start_date, first_year_end_date)
all_period_rent = record.do_generate_details_core(False, start_date, first_year_end_date)
record.first_year_rent = all_period_rent
def do_generate_details_core(self, start_date, end_date):
def do_generate_details_core(self, write_db=False, start_date, end_date):
all_period_rent = 0
monthly_amount = self.total_area * self.unit_price
@@ -515,22 +515,22 @@ class PropertyLeaseContract(models.Model):
"period_rent": period_rent,
}
all_period_rent += period_rent
if write_db:
# 是否免租期 月
if free_start_dict:
self.sudo().write({'breakdown_ids': [(0, 0, free_start_dict)]})
# 是否免租期 月
if free_start_dict:
self.sudo().write({'breakdown_ids': [(0, 0, free_start_dict)]})
# 是否免租期 日
if free_start_day_dict:
self.sudo().write({'breakdown_ids': [(0, 0, free_start_day_dict)]})
# 是否免租期 日
if free_start_day_dict:
self.sudo().write({'breakdown_ids': [(0, 0, free_start_day_dict)]})
# 开始统计月份阶段金额
for k, v in monthly_amount_new_dict.items():
self.sudo().write({'breakdown_ids': [(0, 0, v)]})
# 开始统计月份阶段金额
for k, v in monthly_amount_new_dict.items():
self.sudo().write({'breakdown_ids': [(0, 0, v)]})
# 最后有不足月的单独计算
if monthly_amount_last_dict:
self.sudo().write({'breakdown_ids': [(0, 0, monthly_amount_last_dict)]})
# 最后有不足月的单独计算
if monthly_amount_last_dict:
self.sudo().write({'breakdown_ids': [(0, 0, monthly_amount_last_dict)]})
return all_period_rent