diff --git a/yuthon_property_approval/__manifest__.py b/yuthon_property_approval/__manifest__.py index e84ebb3c9..f814dc5a3 100644 --- a/yuthon_property_approval/__manifest__.py +++ b/yuthon_property_approval/__manifest__.py @@ -15,6 +15,7 @@ 'report/lease_contract_templates.xml', 'report/property_accounting_templates.xml', 'report/property_construction_templates.xml', + 'report/contract_accounts_receivable_templates.xml', 'views/property_billing_confirmation.xml', 'views/inherit_property_tenant_information_views.xml', 'views/property_approval_views.xml', diff --git a/yuthon_property_approval/models/contract_accounts_receivable.py b/yuthon_property_approval/models/contract_accounts_receivable.py index bc8c22b1d..068fec0ef 100644 --- a/yuthon_property_approval/models/contract_accounts_receivable.py +++ b/yuthon_property_approval/models/contract_accounts_receivable.py @@ -10,6 +10,7 @@ class ContractAccountsReceivable(models.Model): lessee_id = fields.Many2one(related="contract_id.lessee_id", string='承租方') property_name = fields.Char(related="contract_id.property_name", string='物业信息') contract_accounts_ids = fields.One2many('property.accounts.receivable', 'contract_accounts_id', string='关联应收账单') + is_print = fields.Boolean(string="打印") json_display = fields.Char( string="收费项目详情", diff --git a/yuthon_property_approval/report/contract_accounts_receivable_templates.xml b/yuthon_property_approval/report/contract_accounts_receivable_templates.xml new file mode 100644 index 000000000..52438d707 --- /dev/null +++ b/yuthon_property_approval/report/contract_accounts_receivable_templates.xml @@ -0,0 +1,85 @@ + + + + + + diff --git a/yuthon_property_approval/report/lease_contract_report.xml b/yuthon_property_approval/report/lease_contract_report.xml index d0f3d4fe1..7b41929ec 100644 --- a/yuthon_property_approval/report/lease_contract_report.xml +++ b/yuthon_property_approval/report/lease_contract_report.xml @@ -34,4 +34,24 @@ report + + 建设工程造价咨询合同报表 + property.construction.approval + qweb-pdf + yuthon_property_approval.report_property_construction_approval + yuthon_property_approval.report_property_construction_approval + 建设工程造价咨询合同报表 + + report + + + 付款通知单报表 + contract.accounts.receivable + qweb-pdf + yuthon_property_approval.report_contract_accounts_receivable + yuthon_property_approval.report_contract_accounts_receivable + 付款通知单报表 + + report + \ No newline at end of file diff --git a/yuthon_property_approval/views/contract_accounts_receivable_viwes.xml b/yuthon_property_approval/views/contract_accounts_receivable_viwes.xml index 801af495e..78f792cb8 100644 --- a/yuthon_property_approval/views/contract_accounts_receivable_viwes.xml +++ b/yuthon_property_approval/views/contract_accounts_receivable_viwes.xml @@ -4,11 +4,12 @@ contract.accounts.receivable.tree contract.accounts.receivable - + +