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

!10495 !10494 添加功能

Browse Source 
Merge pull request !10495 from 李鹏宇/dev
This commit is contained in:
李鹏宇
2026-04-01 12:12:19 +00:00
committed by Gitee
parent b2599aa829 b4c01f0985
commit 31ad2fa5c4
2 changed files with 42 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
yuthon_property_approval/models/property_lease_contract.py
+41 -8
View File
@@ -846,30 +846,64 @@ class PropertyLeaseContract(models.Model):
def end_approval(self):
current_date = date.today()
# 续租审批应退押金逻辑
if self.contract_id and self.self.contract_id.deposit:
if self.contract_id and self.contract_id.deposit and self.contract_type == 'lease_renewal':
management_type_id = self.env['yuthon.management.type'].search([('name', '=', '押金')], limit=1)
bills_list = self.env['property.bills.list'].search([
('contract_id', '=', self.contract_id.id,)
])
workflow_record_id = self.env["soong.workflow.record"].search(
[("res_model", "=", self._name), ("res_id", "=", self.id)])
if not bills_list:
self.env['property.bills.list'].create({
'due_date': fields.Date.today(),
'due_date': self.contract_id.actual_end_time + timedelta(days=1), # 原合同
'management_type_id': management_type_id.id,
'amount': self.contract_id.deposit,
'contract_id': self.contract_id.id,
'remake': '续签退押',
'workflow_record_id': workflow_record_id.id,
})
bank_id = self.env['property.bank.statements'].search([
('name_account', '=', self.contract_id.lessee_id.name),
('remake', '=', '应退押金'),
('contract_ids', 'in', self.id),
('remake', '=', '续签退押'),
])
if not bank_id:
self.env['property.bank.statements'].sudo().create({
'start_time': fields.Datetime.now() + timedelta(hours=8),
lessor_id = self.contract_id.lessor_id # 出租方
tenant_line = self.env['property.tenant.line'].search([
('tenant_id', '=', self.lessee_id.id),
('lease_contract_id', '=', self.id),
], limit=1)
if not tenant_line:
self.env['property.tenant.line'].create({
'tenant_id': self.lessee_id.id,
'lease_contract_id': self.id,
})
company_id = self.env['res.company'].search([('name', '=', '集团本部')], limit=1)
if lessor_id.referred in ['天河投资', '天投城建']:
company_id = self.env['res.company'].search([('name', '=', '集团本部')], limit=1)
elif lessor_id.referred in ['天河物管']:
company_id = self.env['res.company'].search([('name', '=', '天河物管')], limit=1)
elif lessor_id.referred in ['天河粮储']:
company_id = self.env['res.company'].search([('name', '=', '天河粮储')], limit=1)
bank_accounts = self.env['property.bank.line'].search([
('tenant_id', '=', self.lessee_id.id)
]).mapped('bank')
bank_accounts = [acc for acc in bank_accounts if acc][0]
end_date = self.contract_id.actual_end_time + timedelta(days=1)
start_time = f"{end_date} 09:00:00"
bank_id = self.env['property.bank.statements'].sudo().create({
'start_time': start_time,
'name': bank_accounts,
'original_amount': self.contract_id.deposit,
'name_account': self.contract_id.lessee_id.name,
'remake': '应退押金',
'remake': '续签退押',
'lending_direction': 'loan',
'workflow_record_id': workflow_record_id.id,
'company_id': company_id.id,
'your_own_unit': lessor_id.referred,
'your_own_account': lessor_id.rent_account,
})
bank_id._compute_property_employee_id()
if self.term_start_time <= current_date <= self.term_end_time:
new_contact_state = 'ing'
@@ -916,7 +950,6 @@ class PropertyLeaseContract(models.Model):
})
contract._update_contract_lines(contract)
def open_record(self):
return {
'type': 'ir.actions.act_window',
yuthon_property_approval/views/property_lease_contract.xml
+1
View File
@@ -66,6 +66,7 @@
</group>
<!-- 2. 三个字段：每个单独占一横行（各跨两列） -->
<group colspan="2">
<field name="contract_id" options="{'no_open': True}" invisible="not contract_id"/>
<field name="lessor_id" groups="soong_workflow.group_soong_workflow_manager"/>
<field name="rent_company" string="出租方" readonly="1" invisible="contract_sort != 'property'"/>
</group>