diff --git a/yuthon_property/models/property_bank_statements.py b/yuthon_property/models/property_bank_statements.py index dcf6e255e..ebb895c8f 100644 --- a/yuthon_property/models/property_bank_statements.py +++ b/yuthon_property/models/property_bank_statements.py @@ -194,7 +194,9 @@ class ReceivableModifyLine(models.Model): _description = '修改应收账单明细' bank_id = fields.Many2one('property.bank.statements', string='关联银行对账单') + original_amount = fields.Float(related='bank_id.original_amount', string='交易金额', store=False) receivable_id = fields.Many2one('property.accounts.receivable', string='应收账单') + management_type_id = fields.Many2one('yuthon.management.type', related='receivable_id.management_type_id', string='应收类型', store=False) is_write = fields.Boolean() reconciliation_date = fields.Date(string='对账日期') diff --git a/yuthon_property/views/property_bank_statements_views.xml b/yuthon_property/views/property_bank_statements_views.xml index f4d5e2599..0a8ceb674 100644 --- a/yuthon_property/views/property_bank_statements_views.xml +++ b/yuthon_property/views/property_bank_statements_views.xml @@ -62,6 +62,7 @@ + @@ -109,6 +110,31 @@ + + receivable.modify.line.tree + receivable.modify.line + + + + + + + + + + + + + + + + 应收流水中间表 + receivable.modify.line + tree + + + 更新公司 diff --git a/yuthon_report/models/month_receivable_report.py b/yuthon_report/models/month_receivable_report.py index cdbd524a6..88de90ae0 100644 --- a/yuthon_report/models/month_receivable_report.py +++ b/yuthon_report/models/month_receivable_report.py @@ -47,7 +47,11 @@ class MonthReceivableReport(models.Model): } if rec.contract_id and rec.contract_id.lease_ids and rec.contract_id.lease_ids[0].address_id else rec.property_name or '', '承租方名称': rec.lessee_id.name if rec.lessee_id else '', '金额': amount, - '管理员': rec.admin_id.name if rec.admin_id else '', + "管理员": { + 'model': 'res.users', + 'id': rec.admin_id.id, + 'display_name': rec.admin_id.name, + } if rec.admin_id else "", }) stats = [{'name': '合计', 'amount': round(total_amount, 2)}] diff --git a/yuthon_work_brand/views/hr_menus.xml b/yuthon_work_brand/views/hr_menus.xml index d41df883b..70ad8c372 100644 --- a/yuthon_work_brand/views/hr_menus.xml +++ b/yuthon_work_brand/views/hr_menus.xml @@ -954,6 +954,12 @@ parent="yuthon_financial_management_menu" action="yuthon_property.view_property_bank_statements_action1"/> + +