Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: use predefined onload property load_after_mapping (#38209)

Browse Source
This commit is contained in:
Sagar Vora 2023-12-02 20:06:19 +05:30 committed by GitHub
parent 9087e1443e
commit b6a7549407
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
View File

@ -1859,6 +1859,4 @@ def make_purchase_receipt(source_name, target_doc=None):
target_doc, target_doc,
) )
doc.set_onload("ignore_price_list", True)
return doc return doc

1
erpnext/accounts/doctype/sales_invoice/sales_invoice.py
View File

@ -2095,7 +2095,6 @@ def make_delivery_note(source_name, target_doc=None):
set_missing_values, set_missing_values,
) )
doclist.set_onload("ignore_price_list", True)
return doclist return doclist

3
erpnext/buying/doctype/purchase_order/purchase_order.py
View File

@ -713,8 +713,6 @@ def make_purchase_receipt(source_name, target_doc=None):
set_missing_values, set_missing_values,
) )
doc.set_onload("ignore_price_list", True)
return doc return doc
@ -794,7 +792,6 @@ def get_mapped_purchase_invoice(source_name, target_doc=None, ignore_permissions
postprocess, postprocess,
ignore_permissions=ignore_permissions, ignore_permissions=ignore_permissions,
) )
doc.set_onload("ignore_price_list", True)
return doc return doc

1
erpnext/buying/doctype/supplier_quotation/supplier_quotation.py
View File

@ -257,7 +257,6 @@ def make_purchase_order(source_name, target_doc=None):
set_missing_values, set_missing_values,
) )
doclist.set_onload("ignore_price_list", True)
return doclist return doclist

2
erpnext/controllers/sales_and_purchase_return.py
View File

@ -586,8 +586,6 @@ def make_return_doc(
set_missing_values, set_missing_values,
) )
doclist.set_onload("ignore_price_list", True)
return doclist return doclist

14
erpnext/public/js/controllers/transaction.js
View File

@ -357,7 +357,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
onload_post_render() { onload_post_render() {
if(this.frm.doc.__islocal && !(this.frm.doc.taxes || []).length 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()); frappe.after_ajax(() => this.apply_default_taxes());
} else if(this.frm.doc.__islocal && this.frm.doc.company && this.frm.doc["items"] } else if(this.frm.doc.__islocal && this.frm.doc.company && this.frm.doc["items"]
&& !this.frm.doc.is_pos) { && !this.frm.doc.is_pos) {
@ -964,9 +964,9 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
let me = this; let me = this;
this.set_dynamic_labels(); this.set_dynamic_labels();
let company_currency = this.get_company_currency(); 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 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, this.get_exchange_rate(transaction_date, this.frm.doc.currency, company_currency,
function(exchange_rate) { function(exchange_rate) {
@ -998,7 +998,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
} }
if(flt(this.frm.doc.conversion_rate)>0.0) { 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(); this.calculate_taxes_and_totals();
} else if (!this.in_apply_price_list){ } else if (!this.in_apply_price_list){
this.apply_price_list(); this.apply_price_list();
@ -1085,9 +1085,9 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
this.set_dynamic_labels(); this.set_dynamic_labels();
var company_currency = this.get_company_currency(); 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 && 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, this.get_exchange_rate(this.frm.doc.posting_date, this.frm.doc.price_list_currency, company_currency,
function(exchange_rate) { function(exchange_rate) {
me.frm.set_value("plc_conversion_rate", exchange_rate); me.frm.set_value("plc_conversion_rate", exchange_rate);
@ -1476,7 +1476,7 @@ erpnext.TransactionController = class TransactionController extends erpnext.taxe
} }
// Target doc created from a mapped doc // 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. // 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. // `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(); if (calculate_taxes_and_totals) me.calculate_taxes_and_totals();

5
erpnext/selling/doctype/quotation/quotation.py
View File

@ -434,9 +434,6 @@ def _make_sales_order(source_name, target_doc=None, customer_group=None, ignore_
ignore_permissions=ignore_permissions, ignore_permissions=ignore_permissions,
) )
# postprocess: fetch shipping address, set missing values
doclist.set_onload("ignore_price_list", True)
return doclist return doclist
@ -505,8 +502,6 @@ def _make_sales_invoice(source_name, target_doc=None, ignore_permissions=False):
ignore_permissions=ignore_permissions, ignore_permissions=ignore_permissions,
) )
doclist.set_onload("ignore_price_list", True)
return doclist return doclist

3
erpnext/selling/doctype/sales_order/sales_order.py
View File

@ -995,7 +995,6 @@ def make_delivery_note(source_name, target_doc=None, kwargs=None):
# Should be called after mapping items. # Should be called after mapping items.
set_missing_values(so, target_doc) set_missing_values(so, target_doc)
target_doc.set_onload("ignore_price_list", True)
return target_doc return target_doc
@ -1085,8 +1084,6 @@ def make_sales_invoice(source_name, target_doc=None, ignore_permissions=False):
if automatically_fetch_payment_terms: if automatically_fetch_payment_terms:
doclist.set_payment_schedule() doclist.set_payment_schedule()
doclist.set_onload("ignore_price_list", True)
return doclist return doclist

2
erpnext/stock/doctype/delivery_note/delivery_note.py
View File

@ -964,8 +964,6 @@ def make_sales_invoice(source_name, target_doc=None):
if automatically_fetch_payment_terms: if automatically_fetch_payment_terms:
doc.set_payment_schedule() doc.set_payment_schedule()
doc.set_onload("ignore_price_list", True)
return doc return doc

1
erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
View File

@ -1208,7 +1208,6 @@ def make_purchase_invoice(source_name, target_doc=None):
set_missing_values, set_missing_values,
) )
doclist.set_onload("ignore_price_list", True)
return doclist return doclist