From ed0f75651693d70368bbfad382e462117b0bc610 Mon Sep 17 00:00:00 2001 From: zhou <123@> Date: Mon, 4 Aug 2025 12:03:27 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wizard/property_reconciliation_wizard.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/yuthon_property_approval/wizard/property_reconciliation_wizard.py b/yuthon_property_approval/wizard/property_reconciliation_wizard.py index 8f1bf00e8..1a285b7a6 100644 --- a/yuthon_property_approval/wizard/property_reconciliation_wizard.py +++ b/yuthon_property_approval/wizard/property_reconciliation_wizard.py @@ -152,9 +152,10 @@ class PropertyReconciliationWizard(models.Model): ('contract_id', '=', line.contract_id.id), ('collection_type', '=', 'rent'), ] + is_reconciliation = line.amount reconciliation_id = self.env['property.reconciliation.line'].search(domain2, limit=1) self.env['property.accounts.receivable'].create({ - 'is_reconciliation': True, + 'is_reconciliation': is_reconciliation, 'due_date': line.due_date, 'penalty': reconciliation_id.rent, 'management_type_id': management_type_id.id, From 57e7ce89c5d13e019f743b51ebd87fc3053470ed Mon Sep 17 00:00:00 2001 From: zhou <123@> Date: Mon, 4 Aug 2025 12:09:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yuthon_property_approval/models/inherit_yuthon_property.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/yuthon_property_approval/models/inherit_yuthon_property.py b/yuthon_property_approval/models/inherit_yuthon_property.py index b783406c7..441fbc1c4 100644 --- a/yuthon_property_approval/models/inherit_yuthon_property.py +++ b/yuthon_property_approval/models/inherit_yuthon_property.py @@ -61,6 +61,8 @@ class PropertyBankStatements(models.Model): ('is_reconciliation', '=', True) ]) rec.bank_state = 'not_reconciled' + rec.no_amount = rec.yes_amount + rec.yes_amount = 0 if accounts: for account in accounts: account.write({'is_reconciliation': False,