diff --git a/yuthon_property/models/property_bank_statements.py b/yuthon_property/models/property_bank_statements.py
index 568446436..7d724a43e 100644
--- a/yuthon_property/models/property_bank_statements.py
+++ b/yuthon_property/models/property_bank_statements.py
@@ -206,15 +206,34 @@ class ReceivableModifyLine(models.Model):
bank_id = fields.Many2one('property.bank.statements', string='关联银行对账单')
original_amount = fields.Float(related='bank_id.original_amount', string='交易金额', store=False)
+ payout_date = fields.Date(related='receivable_id.payout_date', string='收款日期')
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='合同编号')
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)
- property_name = fields.Text(string='物业', compute='_compute_property_name', store=False, search='_search_property_name')
- delivered1 = fields.Float(related='receivable_id.delivered1', string='已收金额', store=False)
+ property_name = fields.Text(string='物业名称', compute='_compute_property_name', store=False, search='_search_property_name')
+ delivered1 = fields.Float(related='receivable_id.delivered1', string='金额', store=False)
+ remake = fields.Text(related='receivable_id.remark', string='备注', store=False)
is_write = fields.Boolean()
+ lessee_id = fields.Many2one('property.tenant.information', string='承租方', compute='_compute_related_fields',
+ store=False, index=True)
+ company_id = fields.Many2one('yuthon.property.company', string='公司', compute='_compute_related_fields',
+ store=False, index=True)
+ precinct_id = fields.Many2one('yuthon.precinct.message', string='管理员', compute='_compute_related_fields',
+ store=False, index=True)
+
+ @api.depends('receivable_id')
+ def _compute_related_fields(self):
+ for rec in self:
+ rec.lessee_id = False
+ rec.company_id = False
+ rec.precinct_id = False
+ if rec.receivable_id:
+ rec.lessee_id = rec.receivable_id.lessee_id
+ rec.company_id = rec.receivable_id.company_id
+ rec.precinct_id = rec.receivable_id.precinct_id
@api.depends('receivable_id')
def _compute_property_name(self):
@@ -239,7 +258,6 @@ class ReceivableModifyLine(models.Model):
not_collected = fields.Float(related='receivable_id.submitted', string='未收', store=False)
amount = fields.Float(string='已对金额')
has_date = fields.Date(related='receivable_id.has_date', string='退款日期', store=False)
- payout_date = fields.Date(related='receivable_id.payout_date', string='收款日期', store=False)
penalty_pay_line_ids = fields.Many2many(
'penalty.pay.line',
diff --git a/yuthon_property/views/property_bank_statements_views.xml b/yuthon_property/views/property_bank_statements_views.xml
index 6572ef973..a34f01334 100644
--- a/yuthon_property/views/property_bank_statements_views.xml
+++ b/yuthon_property/views/property_bank_statements_views.xml
@@ -141,7 +141,23 @@
-
+
+ receivable.modify.line.tree
+ receivable.modify.line
+
+
+
+
+
+
+
+
+
+
+
+
+
+
receivable.modify.line.search
receivable.modify.line
@@ -176,6 +192,14 @@
+
+ 收款明细
+ receivable.modify.line
+ tree
+ [('amount','>', 0), ('reconciliation_date', '!=', False)]
+
+
更新公司
diff --git a/yuthon_work_brand/views/hr_menus.xml b/yuthon_work_brand/views/hr_menus.xml
index a61a28cc2..f598a364a 100644
--- a/yuthon_work_brand/views/hr_menus.xml
+++ b/yuthon_work_brand/views/hr_menus.xml
@@ -959,6 +959,11 @@
receivable.modify.line
tree
+