diff --git a/yuthon_property_approval/models/inherit_yuthon_property.py b/yuthon_property_approval/models/inherit_yuthon_property.py index 74459c348..f5bdae624 100644 --- a/yuthon_property_approval/models/inherit_yuthon_property.py +++ b/yuthon_property_approval/models/inherit_yuthon_property.py @@ -72,8 +72,8 @@ class PropertyBankStatements(models.Model): for account in accounts: account.write({'is_reconciliation': False, 'payout_date': False, - 'delivered1': 0, - 'due_date_end' :None, + 'delivered1': 0, + 'due_date_end' :None, 'reconciliation_time': False, 'remark':None, }) diff --git a/yuthon_property_approval/wizard/property_reconciliation_wizard.py b/yuthon_property_approval/wizard/property_reconciliation_wizard.py index a3134647f..d2c42abe7 100644 --- a/yuthon_property_approval/wizard/property_reconciliation_wizard.py +++ b/yuthon_property_approval/wizard/property_reconciliation_wizard.py @@ -214,7 +214,8 @@ class PropertyReconciliationWizard(models.Model): receivable.write({ 'is_reconciliation': is_reconciliation, 'delivered1': line.amount, - 'payout_date': self.actual_date, + 'due_date_end': rec.actual_date if line.rent == line.amount else None, + 'payout_date': rec.actual_date if line.rent == line.amount else None, 'remark': line.remake, 'reconciliation_time': fields.Datetime.now(), 'receivable_log': f'当前登录人{rec.env.user.name}于{fields.Datetime.now()}对户名为{rec.bank_id.name_account}进行对账操作,对账应收金额为{rec.receivable_total},实际金额为{rec.actual_total}'