diff --git a/yuthon_property/views/property_bank_statements_views.xml b/yuthon_property/views/property_bank_statements_views.xml index d1043208e..035c05dfb 100644 --- a/yuthon_property/views/property_bank_statements_views.xml +++ b/yuthon_property/views/property_bank_statements_views.xml @@ -11,7 +11,7 @@ - + diff --git a/yuthon_property_approval/models/inherit_yuthon_property.py b/yuthon_property_approval/models/inherit_yuthon_property.py index f02edd967..2b331ae2a 100644 --- a/yuthon_property_approval/models/inherit_yuthon_property.py +++ b/yuthon_property_approval/models/inherit_yuthon_property.py @@ -43,9 +43,24 @@ class PropertyBankStatements(models.Model): contract_id = fields.Many2one('property.lease.contract', string="关联租赁合同审批") contract_ids = fields.Many2many('property.lease.contract', string="租赁合同审批") - property_name = fields.Char(string="物业名称") + property_name = fields.Text(string="物业名称", compute="compute_property_name", store=True) accounts_id = fields.Many2one('property.accounts.approval', string="关联生成应收审批单") + def update_property_name(self): + property_ids = self.env["property.bank.statements"].browse( + self._context.get('active_ids', self._context.get('active_id'))) + for rec in property_ids: + rec.compute_property_name() + + @api.depends('contract_ids') + def compute_property_name(self): + for rec in self: + rec.property_name = "" + if rec.contract_ids: + for contract in rec.contract_ids: + if contract.property_name: + rec.property_name += contract.property_name + "\n" + def batch_revocation(self): bank_ids = self.env["property.bank.statements"].browse( self._context.get('active_ids', self._context.get('active_id'))) diff --git a/yuthon_property_approval/report/lease_contract_templates.xml b/yuthon_property_approval/report/lease_contract_templates.xml index 92b6ca6b0..792d41642 100644 --- a/yuthon_property_approval/report/lease_contract_templates.xml +++ b/yuthon_property_approval/report/lease_contract_templates.xml @@ -91,7 +91,94 @@ - + + + + + + + +
证照: + + +
+
+
+ 无 +
授权委托书: + + +
+
+
+ 无 +
+ + + + + + + +
资产评估结果明细表: + + +
+
+
+ 无 +
合同/协议: + + +
+
+
+ 无 +
+ + + + + + + +
成交确认书: + + +
+
+
+ 无 +
合同签名附件: + + +
+
+
+ 无 +
+ + + + + + + +
安全生产责任书(住宅): + + +
+
+
+ 无 +
其他: + + +
+
+
+ 无 +
diff --git a/yuthon_property_approval/views/inherit_yuthon_property_views.xml b/yuthon_property_approval/views/inherit_yuthon_property_views.xml index cf1c1671c..77e063bbe 100644 --- a/yuthon_property_approval/views/inherit_yuthon_property_views.xml +++ b/yuthon_property_approval/views/inherit_yuthon_property_views.xml @@ -317,7 +317,7 @@ filter_domain="['|', '|', ('property_ids.name', 'ilike', self), ('lessee_id.name', 'ilike', self), ('contract_id.contract_code', 'ilike', self), ('company_id.name', 'ilike', self)]"/> - + @@ -526,6 +526,7 @@ +