nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-06 21:59:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #25034 from anupamvs/naming-pre-release

Browse Source 
fix: unable to submit stock entry
This commit is contained in:
rohitwaghchaure
2021-03-27 19:50:06 +05:30
committed by GitHub
parent 6c7f029597 d429138dcc
commit f4901b4f22
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1132,6 +1132,11 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
this.calculate_net_weight(); this.calculate_net_weight();
} }
// for handling customization not to fetch price list rate
if(frappe.flags.dont_fetch_price_list_rate) {
return
}
if (!dont_fetch_price_list_rate && if (!dont_fetch_price_list_rate &&
frappe.meta.has_field(doc.doctype, "price_list_currency")) { frappe.meta.has_field(doc.doctype, "price_list_currency")) {
this.apply_price_list(item, true); this.apply_price_list(item, true);

1
erpnext/stock/doctype/stock_entry/stock_entry.js
View File

@@ -817,7 +817,6 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
} }
erpnext.hide_company(); erpnext.hide_company();
erpnext.utils.add_item(this.frm); erpnext.utils.add_item(this.frm);
this.frm.trigger('add_to_transit');
}, },
scan_barcode: function() { scan_barcode: function() {