添加功能
This commit is contained in:
@@ -37,7 +37,7 @@
|
||||
<field name="urgency_level" readonly="1"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="is_chapter" required="1"/>
|
||||
<field name="is_chapter"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="is_meet"/>
|
||||
|
||||
@@ -3,7 +3,7 @@ from odoo import models, fields, api
|
||||
|
||||
class PropertyBillsList(models.Model):
|
||||
_name = 'property.bills.list'
|
||||
_description = '应收账单'
|
||||
_description = '应付账单'
|
||||
|
||||
management_type_id = fields.Many2one('yuthon.management.type', string='类型')
|
||||
due_date = fields.Date(string='应付日期')
|
||||
|
||||
@@ -677,7 +677,10 @@ class PropertyLeaseContract(models.Model):
|
||||
|
||||
if lease.address_id.is_message_fee and lease.address_id.message_standard_id:
|
||||
if lease.address_id.rent_area > 0:
|
||||
total_months = (end.year - start.year) * 12 + (end.month - start.month)
|
||||
if start and end:
|
||||
total_months = (end.year - start.year) * 12 + (end.month - start.month)
|
||||
else:
|
||||
total_months = 0
|
||||
management_month_number = max(total_months, 0)
|
||||
message_fee_values.append([0, 0, {
|
||||
'breakdown_id': rec.id,
|
||||
@@ -729,7 +732,32 @@ class PropertyLeaseContract(models.Model):
|
||||
|
||||
def end_approval(self):
|
||||
current_date = date.today()
|
||||
old_contact_state = None
|
||||
# 续租审批应退押金逻辑
|
||||
if self.contract_id:
|
||||
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,
|
||||
])
|
||||
if not bills_list:
|
||||
self.env['property.bills.list'].create({
|
||||
'due_date': fields.Date.today(),
|
||||
'management_type_id': management_type_id.id,
|
||||
'amount': self.contract_id.deposit,
|
||||
'contract_id': self.contract_id.id,
|
||||
})
|
||||
|
||||
bank_id = self.env['property.bank.statements'].search([
|
||||
('name_account', '=', self.contract_id.lessee_id.name),
|
||||
('remake', '=', '应退押金'),
|
||||
])
|
||||
if not bank_id:
|
||||
self.env['property.bank.statements'].sudo().create({
|
||||
'start_time': fields.Datetime.now() + timedelta(hours=8),
|
||||
'original_amount': self.contract_id.deposit,
|
||||
'name_account': self.contract_id.lessee_id.name,
|
||||
'remake': '应退押金',
|
||||
})
|
||||
|
||||
if self.term_start_time <= current_date <= self.term_end_time:
|
||||
new_contact_state = 'ing'
|
||||
old_contact_state = 'terminate'
|
||||
|
||||
@@ -46,7 +46,7 @@
|
||||
<field name="is_split" string="拆分"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="is_chapter" required="1"/>
|
||||
<field name="is_chapter"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="is_issues"/>
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
<field name="urgency_level" readonly="1"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="is_chapter" required="1"/>
|
||||
<field name="is_chapter"/>
|
||||
</group>
|
||||
<group>
|
||||
<field name="is_issues"/>
|
||||
|
||||
Reference in New Issue
Block a user