From 8142c66ddfe3c346b1d5e7c717a2cb286b108915 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Tue, 12 Dec 2023 15:18:54 +0530 Subject: [PATCH 1/2] fix: Init internal child table values --- erpnext/controllers/accounts_controller.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index bbc9295ecfd..e3b71df0978 100644 --- a/erpnext/controllers/accounts_controller.py +++ b/erpnext/controllers/accounts_controller.py @@ -165,6 +165,7 @@ class AccountsController(TransactionBase): self.disable_pricing_rule_on_internal_transfer() self.disable_tax_included_prices_for_internal_transfer() self.set_incoming_rate() + self.init_internal_values() if self.meta.get_field("currency"): self.calculate_taxes_and_totals() @@ -223,6 +224,19 @@ class AccountsController(TransactionBase): self.set_total_in_words() + def init_internal_values(self): + # init all the internal values as 0 on sa + if self.docstatus.is_draft(): + # TODO: Add all such pending values here + fields = ["billed_amt", "delivered_qty"] + for item in self.get("items"): + for field in fields: + if hasattr(item, field): + item.set(field, 0) + + def before_cancel(self): + validate_einvoice_fields(self) + def _remove_references_in_unreconcile(self): upe = frappe.qb.DocType("Unreconcile Payment Entries") rows = ( -- GitLab From 909b8bcc19576cf7b0cf35551b57c172dab298ad Mon Sep 17 00:00:00 2001 From: Charles-Henri Decultot Date: Fri, 15 Dec 2023 19:54:00 +0000 Subject: [PATCH 2/2] fix: merge conflict --- erpnext/controllers/accounts_controller.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py index e3b71df0978..e28ae6b7223 100644 --- a/erpnext/controllers/accounts_controller.py +++ b/erpnext/controllers/accounts_controller.py @@ -234,9 +234,6 @@ class AccountsController(TransactionBase): if hasattr(item, field): item.set(field, 0) - def before_cancel(self): - validate_einvoice_fields(self) - def _remove_references_in_unreconcile(self): upe = frappe.qb.DocType("Unreconcile Payment Entries") rows = ( -- GitLab