fix: use predefined onload property `load_after_mapping` (#38209)
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
index f9c9fb5..262732c 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
@@ -1859,6 +1859,4 @@
target_doc,
)
- doc.set_onload("ignore_price_list", True)
-
return doc
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index 0ebf335..96a557b 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -2095,7 +2095,6 @@
set_missing_values,
)
- doclist.set_onload("ignore_price_list", True)
return doclist
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py
index b446512..2efb46e 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.py
@@ -713,8 +713,6 @@
set_missing_values,
)
- doc.set_onload("ignore_price_list", True)
-
return doc
@@ -794,7 +792,6 @@
postprocess,
ignore_permissions=ignore_permissions,
)
- doc.set_onload("ignore_price_list", True)
return doc
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
index bb0c269..e2b737b 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
@@ -257,7 +257,6 @@
set_missing_values,
)
- doclist.set_onload("ignore_price_list", True)
return doclist
diff --git a/erpnext/controllers/sales_and_purchase_return.py b/erpnext/controllers/sales_and_purchase_return.py
index 8e3a15a..81e71e3 100644
--- a/erpnext/controllers/sales_and_purchase_return.py
+++ b/erpnext/controllers/sales_and_purchase_return.py
@@ -586,8 +586,6 @@
set_missing_values,
)
- doclist.set_onload("ignore_price_list", True)
-
return doclist
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index 6dc24fa..8c0d84b 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -357,7 +357,7 @@
onload_post_render() {
if(this.frm.doc.__islocal && !(this.frm.doc.taxes || []).length
- && !(this.frm.doc.__onload ? this.frm.doc.__onload.load_after_mapping : false)) {
+ && !this.frm.doc.__onload?.load_after_mapping) {
frappe.after_ajax(() => this.apply_default_taxes());
} else if(this.frm.doc.__islocal && this.frm.doc.company && this.frm.doc["items"]
&& !this.frm.doc.is_pos) {
@@ -964,9 +964,9 @@
let me = this;
this.set_dynamic_labels();
let company_currency = this.get_company_currency();
- // Added `ignore_price_list` to determine if document is loading after mapping from another doc
+ // Added `load_after_mapping` to determine if document is loading after mapping from another doc
if(this.frm.doc.currency && this.frm.doc.currency !== company_currency
- && !(this.frm.doc.__onload && this.frm.doc.__onload.ignore_price_list)) {
+ && !this.frm.doc.__onload?.load_after_mapping) {
this.get_exchange_rate(transaction_date, this.frm.doc.currency, company_currency,
function(exchange_rate) {
@@ -998,7 +998,7 @@
}
if(flt(this.frm.doc.conversion_rate)>0.0) {
- if(this.frm.doc.__onload && this.frm.doc.__onload.ignore_price_list) {
+ if(this.frm.doc.__onload?.load_after_mapping) {
this.calculate_taxes_and_totals();
} else if (!this.in_apply_price_list){
this.apply_price_list();
@@ -1085,9 +1085,9 @@
this.set_dynamic_labels();
var company_currency = this.get_company_currency();
- // Added `ignore_price_list` to determine if document is loading after mapping from another doc
+ // Added `load_after_mapping` to determine if document is loading after mapping from another doc
if(this.frm.doc.price_list_currency !== company_currency &&
- !(this.frm.doc.__onload && this.frm.doc.__onload.ignore_price_list)) {
+ !this.frm.doc.__onload?.load_after_mapping) {
this.get_exchange_rate(this.frm.doc.posting_date, this.frm.doc.price_list_currency, company_currency,
function(exchange_rate) {
me.frm.set_value("plc_conversion_rate", exchange_rate);
@@ -1476,7 +1476,7 @@
}
// Target doc created from a mapped doc
- if (this.frm.doc.__onload && this.frm.doc.__onload.ignore_price_list) {
+ if (this.frm.doc.__onload?.load_after_mapping) {
// Calculate totals even though pricing rule is not applied.
// `apply_pricing_rule` is triggered due to change in data which most likely contributes to Total.
if (calculate_taxes_and_totals) me.calculate_taxes_and_totals();
diff --git a/erpnext/selling/doctype/quotation/quotation.py b/erpnext/selling/doctype/quotation/quotation.py
index 8d3bb78..00b79e3 100644
--- a/erpnext/selling/doctype/quotation/quotation.py
+++ b/erpnext/selling/doctype/quotation/quotation.py
@@ -434,9 +434,6 @@
ignore_permissions=ignore_permissions,
)
- # postprocess: fetch shipping address, set missing values
- doclist.set_onload("ignore_price_list", True)
-
return doclist
@@ -505,8 +502,6 @@
ignore_permissions=ignore_permissions,
)
- doclist.set_onload("ignore_price_list", True)
-
return doclist
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index fd6c027..09941ea 100755
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -995,7 +995,6 @@
# Should be called after mapping items.
set_missing_values(so, target_doc)
- target_doc.set_onload("ignore_price_list", True)
return target_doc
@@ -1085,8 +1084,6 @@
if automatically_fetch_payment_terms:
doclist.set_payment_schedule()
- doclist.set_onload("ignore_price_list", True)
-
return doclist
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py
index e44736b..a101bdf 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.py
@@ -964,8 +964,6 @@
if automatically_fetch_payment_terms:
doc.set_payment_schedule()
- doc.set_onload("ignore_price_list", True)
-
return doc
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
index 907bc67..ab07271 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
@@ -1208,7 +1208,6 @@
set_missing_values,
)
- doclist.set_onload("ignore_price_list", True)
return doclist