From a6746407e5315fa77c445c34f1dbad5eed050c23 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 28 Mar 2018 11:16:00 +0530 Subject: [PATCH 1/3] Fixed waiting qty in item dashboard data --- erpnext/stock/dashboard/item_dashboard.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/stock/dashboard/item_dashboard.js b/erpnext/stock/dashboard/item_dashboard.js index dff65afca3..edd594afb8 100644 --- a/erpnext/stock/dashboard/item_dashboard.js +++ b/erpnext/stock/dashboard/item_dashboard.js @@ -88,7 +88,7 @@ erpnext.stock.ItemDashboard = Class.extend({ if(!data) data = []; data.forEach(function(d) { - d.actual_or_pending = d.projected_qty + d.reserved_qty + d.reserved_qty_for_production; + d.actual_or_pending = d.projected_qty + d.reserved_qty + d.reserved_qty_for_production + d.reserved_qty_for_sub_contract; d.pending_qty = 0; d.total_reserved = d.reserved_qty + d.reserved_qty_for_production + d.reserved_qty_for_sub_contract; if(d.actual_or_pending > d.actual_qty) { From 7041a4529428d1e082628e93ee6996597f9747fa Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 28 Mar 2018 15:50:14 +0530 Subject: [PATCH 2/3] Update fix_reserved_qty_for_sub_contract.py --- erpnext/patches/v10_0/fix_reserved_qty_for_sub_contract.py | 1 + 1 file changed, 1 insertion(+) diff --git a/erpnext/patches/v10_0/fix_reserved_qty_for_sub_contract.py b/erpnext/patches/v10_0/fix_reserved_qty_for_sub_contract.py index 5d025374ed..ded44e8399 100644 --- a/erpnext/patches/v10_0/fix_reserved_qty_for_sub_contract.py +++ b/erpnext/patches/v10_0/fix_reserved_qty_for_sub_contract.py @@ -6,6 +6,7 @@ import frappe from erpnext.stock.utils import get_bin def execute(): + frappe.reload_doc("stock", "doctype", "bin") frappe.reload_doc("buying", "doctype", "purchase_order_item_supplied") for d in frappe.db.sql(""" select distinct rm_item_code, reserve_warehouse From 0794816527d430675a533a155d74d7faf2756f6f Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 28 Mar 2018 16:21:16 +0600 Subject: [PATCH 3/3] bumped to version 10.1.17 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index a16538f1be..fe93bc493b 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -5,7 +5,7 @@ import frappe from erpnext.hooks import regional_overrides from frappe.utils import getdate -__version__ = '10.1.16' +__version__ = '10.1.17' def get_default_company(user=None): '''Get default company for user'''