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

Merge pull request #16415 from ks093/ks093-shopping-cart-fixes

Browse Source 
fix: Show stock validation message while placing order and Quotation series field fix in shopping cart settings.
This commit is contained in:
Nabin Hait 2019-01-18 10:46:24 +05:30 committed by GitHub
commit 7bea25a23a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/shopping_cart/cart.py
View File

@ -66,7 +66,7 @@ def place_order():
sales_order = frappe.get_doc(_make_sales_order(quotation.name, ignore_permissions=True)) sales_order = frappe.get_doc(_make_sales_order(quotation.name, ignore_permissions=True))
for item in sales_order.get("items"): for item in sales_order.get("items"):
item.reserved_warehouse, is_stock_item = frappe.db.get_value("Item", item.reserved_warehouse, is_stock_item = frappe.db.get_value("Item",
item.item_code, ["website_warehouse", "is_stock_item"]) or None, None item.item_code, ["website_warehouse", "is_stock_item"])
if is_stock_item: if is_stock_item:
item_stock = get_qty_in_stock(item.item_code, "website_warehouse") item_stock = get_qty_in_stock(item.item_code, "website_warehouse")

1
erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.js
View File

@ -5,6 +5,7 @@ $.extend(cur_frm.cscript, {
onload: function() { onload: function() {
if(cur_frm.doc.__onload && cur_frm.doc.__onload.quotation_series) { if(cur_frm.doc.__onload && cur_frm.doc.__onload.quotation_series) {
cur_frm.fields_dict.quotation_series.df.options = cur_frm.doc.__onload.quotation_series; cur_frm.fields_dict.quotation_series.df.options = cur_frm.doc.__onload.quotation_series;
cur_frm.refresh_field("quotation_series");
} }
}, },
refresh: function(){ refresh: function(){