diff --git a/yuthon_property_approval/models/inherit_yuthon_property.py b/yuthon_property_approval/models/inherit_yuthon_property.py index ea7733b97..b1310bacd 100644 --- a/yuthon_property_approval/models/inherit_yuthon_property.py +++ b/yuthon_property_approval/models/inherit_yuthon_property.py @@ -60,7 +60,8 @@ class PropertyBankStatements(models.Model): for rec in self: for modify in rec.receivable_modify_ids: if modify.is_write: - modify.receivable_id.delivered1 -= modify.amount + new_delivered = modify.receivable_id.delivered1 - modify.amount + modify.receivable_id.delivered1 = max(new_delivered, 0) modify.receivable_id.is_reconciliation = False modify.receivable_id.reconciliation_time = False modify.receivable_id.payout_date = False @@ -267,7 +268,6 @@ class PropertyBankStatements(models.Model): context = { "default_actual_date": fields.Date.to_date(start_time), "default_bank_id": self.id, - "default_remake": self.remake, "default_bank_branch": self.bank_branch, "default_account": record.name, "default_actual_total": record.original_amount, diff --git a/yuthon_property_approval/wizard/property_reconciliation_wizard.py b/yuthon_property_approval/wizard/property_reconciliation_wizard.py index 23d45990d..f67c462a6 100644 --- a/yuthon_property_approval/wizard/property_reconciliation_wizard.py +++ b/yuthon_property_approval/wizard/property_reconciliation_wizard.py @@ -25,11 +25,11 @@ class PropertyReconciliationWizard(models.Model): remake = fields.Text(string='备注') reconciliation_line_ids = fields.One2many('property.reconciliation.line', 'reconciliation_id', string='对账明细') - @api.onchange('reconciliation_line_ids.amount', 'actual_total') + @api.onchange('reconciliation_line_ids', 'actual_total') def _onchange_amount_reconciled(self): for rec in self: rec.amount_been_reconciled = sum(line.amount for line in rec.reconciliation_line_ids) - rec.amount_reconciled = rec.receivable_total - rec.amount_been_reconciled + rec.amount_reconciled = rec.actual_total - rec.amount_been_reconciled @api.depends('reconciliation_line_ids') def _compute_receivable_total(self):