添加功能
This commit is contained in:
@@ -226,6 +226,7 @@ class ReceivableModifyLine(models.Model):
|
||||
no_amount = fields.Float(related='bank_id.no_amount', string='未对', store=False)
|
||||
bank_state = fields.Selection(related='bank_id.bank_state', string='状态', store=False)
|
||||
receivable_id = fields.Many2one('property.accounts.receivable', string='合同编号')
|
||||
contract_id = fields.Many2one('property.lease.contract', string='关联租赁合同', compute='_compute_contract_id')
|
||||
management_type_id = fields.Many2one('yuthon.management.type', related='receivable_id.management_type_id', string='应收类型', store=True)
|
||||
due_date = fields.Date(related='receivable_id.due_date', string='应收开始', store=False)
|
||||
due_date_end = fields.Date(related='receivable_id.due_date_end', string='应收结束', store=False)
|
||||
@@ -240,6 +241,13 @@ class ReceivableModifyLine(models.Model):
|
||||
# search='_search_lessee_id',
|
||||
# )
|
||||
|
||||
@api.depends('receivable_id')
|
||||
def _compute_contract_id(self):
|
||||
for rec in self:
|
||||
rec.contract_id = False
|
||||
if rec.receivable_id:
|
||||
rec.contract_id = rec.receivable_id.contract_id
|
||||
|
||||
@api.depends('receivable_id')
|
||||
def _compute_lessee_id_company(self):
|
||||
for rec in self:
|
||||
|
||||
@@ -240,7 +240,7 @@ class PropertyLeaseContract(models.Model):
|
||||
electricity_fee_ids = fields.One2many('property.electric.fee.line', 'contract_id', string="物业电表明细行")
|
||||
other_ids = fields.One2many('property.other.fee.line', 'other_id', string="其他费用明细行")
|
||||
lease_bank_ids = fields.One2many('property.bank.line', 'contract_id', string="承租方账户明细行")
|
||||
bank_statements_ids = fields.One2many('property.bank.statements', 'contract_id', string="银行流水明细行")
|
||||
bank_statements_ids = fields.One2many('receivable.modify.line', 'contract_id', string="银行流水明细行")
|
||||
contact_state = fields.Selection([('to', '待执行' ), ('ing', '执行中'), ('terminate', '中止'), ('complete', '完成'), ('early_termination', '提前终止'), ('settle', '结清')], string='合同管理状态', default='to')
|
||||
# 附件
|
||||
license_ids = fields.Many2many('ir.attachment',
|
||||
|
||||
@@ -336,19 +336,21 @@
|
||||
</tree>
|
||||
</field>
|
||||
</page>
|
||||
<page string="银行流水" invisible="1">
|
||||
<page string="银行流水">
|
||||
<field name="bank_statements_ids" string=" ">
|
||||
<tree editable="bottom">
|
||||
<field name="start_time"/>
|
||||
<field name="company_id" required="1"/>
|
||||
<field name="name"/>
|
||||
<field name="name_account"/>
|
||||
<field name="contract_account"/>
|
||||
<field name="remake"/>
|
||||
<field name="property_ids" widget="many2many_tags" options="{'no_create': True}"/>
|
||||
<field name="contract_penalty"/>
|
||||
<field name="contract_id" column_invisible="1"/>
|
||||
<field name="management_type_id"/>
|
||||
<field name="due_date"/>
|
||||
<field name="due_date_end"/>
|
||||
<field name="reconciliation_date"/>
|
||||
<field name="has_date"/>
|
||||
<field name="amount"/>
|
||||
<field name="original_amount"/>
|
||||
<field name="voucher_type"/>
|
||||
<field name="delivered1"/>
|
||||
<field name="no_amount"/>
|
||||
<field name="not_collected"/>
|
||||
<field name="bank_state"/>
|
||||
</tree>
|
||||
</field>
|
||||
</page>
|
||||
@@ -844,19 +846,21 @@
|
||||
</tree>
|
||||
</field>
|
||||
</page>
|
||||
<page string="银行流水" invisible="1">
|
||||
<page string="银行流水">
|
||||
<field name="bank_statements_ids" string=" ">
|
||||
<tree editable="bottom" delete="false">
|
||||
<field name="start_time"/>
|
||||
<field name="company_id" options="{'no_open': True}"/>
|
||||
<field name="name"/>
|
||||
<field name="name_account"/>
|
||||
<field name="contract_account"/>
|
||||
<field name="remake"/>
|
||||
<field name="property_ids" widget="many2many_tags" options="{'no_create': True}"/>
|
||||
<field name="contract_penalty"/>
|
||||
<field name="contract_id" column_invisible="1"/>
|
||||
<field name="management_type_id"/>
|
||||
<field name="due_date"/>
|
||||
<field name="due_date_end"/>
|
||||
<field name="reconciliation_date"/>
|
||||
<field name="has_date"/>
|
||||
<field name="amount"/>
|
||||
<field name="original_amount"/>
|
||||
<field name="voucher_type"/>
|
||||
<field name="delivered1"/>
|
||||
<field name="no_amount"/>
|
||||
<field name="not_collected"/>
|
||||
<field name="bank_state"/>
|
||||
</tree>
|
||||
</field>
|
||||
</page>
|
||||
|
||||
Reference in New Issue
Block a user