diff --git a/yuthon_property_approval/models/inherit_yuthon_property.py b/yuthon_property_approval/models/inherit_yuthon_property.py index b7e8ccc62..ef5fca032 100644 --- a/yuthon_property_approval/models/inherit_yuthon_property.py +++ b/yuthon_property_approval/models/inherit_yuthon_property.py @@ -445,6 +445,7 @@ class PropertyBankStatements(models.Model): "default_bank_id": self.id, "default_bank_branch": self.bank_branch, "default_account": record.name, + "default_remake": record.remark, "default_actual_total": record.original_amount, "default_reconciliation_line_ids": all_vals, # 租金,应收日期排序、管理费、电、水、押金 'default_amount_reconciled': self.no_amount, diff --git a/yuthon_property_approval/wizard/property_reconciliation_wizard.py b/yuthon_property_approval/wizard/property_reconciliation_wizard.py index 58cb6d2f2..b87fbc754 100644 --- a/yuthon_property_approval/wizard/property_reconciliation_wizard.py +++ b/yuthon_property_approval/wizard/property_reconciliation_wizard.py @@ -30,7 +30,7 @@ class PropertyReconciliationWizard(models.Model): for rec in self: rec.amount_reconciled = rec.actual_total - rec.amount_been_reconciled - sum(line.amount for line in rec.reconciliation_line_ids) for line in rec.reconciliation_line_ids: - if line.rent_month == line.amount and line.collection_type == 'rent' and line.due_date.year == rec.actual_date.year and line.due_date.month == rec.actual_date.month: + if line.rent_month == line.amount and line.collection_type == 'rent' and line.due_date.year != rec.actual_date.year and line.due_date.month != rec.actual_date.month: line.remake = str(rec.actual_date) + '补' + str(line.due_date) @api.depends('reconciliation_line_ids')