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

[minor]

Browse Source
This commit is contained in:
Rushabh Mehta
2016-05-31 07:22:37 +05:30
parent bc92824bc4
commit 0dcb861b56
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/accounts/utils.py
View File

@@ -7,7 +7,6 @@ import frappe
from frappe.utils import nowdate, cstr, flt, cint, now, getdate from frappe.utils import nowdate, cstr, flt, cint, now, getdate
from frappe import throw, _ from frappe import throw, _
from frappe.utils import formatdate from frappe.utils import formatdate
import frappe.desk.reportview
# imported to enable erpnext.accounts.utils.get_account_currency # imported to enable erpnext.accounts.utils.get_account_currency
from erpnext.accounts.doctype.account.account import get_account_currency from erpnext.accounts.doctype.account.account import get_account_currency

1
erpnext/stock/dashboard/item_dashboard.js
View File

@@ -79,6 +79,7 @@ erpnext.stock.ItemDashboard = Class.extend({
}, },
get_item_dashboard_data: function(data, max_count, show_item) { get_item_dashboard_data: function(data, max_count, show_item) {
if(!max_count) max_count = 0; if(!max_count) max_count = 0;
if(!data) data = [];
data.forEach(function(d) { 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.pending_qty = 0; d.pending_qty = 0;