diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py index 3b78683253..27f1394afe 100644 --- a/erpnext/accounts/utils.py +++ b/erpnext/accounts/utils.py @@ -7,7 +7,6 @@ import frappe from frappe.utils import nowdate, cstr, flt, cint, now, getdate from frappe import throw, _ from frappe.utils import formatdate -import frappe.desk.reportview # imported to enable erpnext.accounts.utils.get_account_currency from erpnext.accounts.doctype.account.account import get_account_currency @@ -128,20 +127,20 @@ def add_ac(args=None): if not args: args = frappe.local.form_dict args.pop("cmd") - + ac = frappe.new_doc("Account") - + if args.get("ignore_permissions"): ac.flags.ignore_permissions = True args.pop("ignore_permissions") - + ac.update(args) ac.old_parent = "" ac.freeze_account = "No" if cint(ac.get("is_root")): ac.parent_account = None - ac.flags.ignore_mandatory = True - + ac.flags.ignore_mandatory = True + ac.insert() return ac.name diff --git a/erpnext/stock/dashboard/item_dashboard.js b/erpnext/stock/dashboard/item_dashboard.js index 99edb0f10b..1c7e50409d 100644 --- a/erpnext/stock/dashboard/item_dashboard.js +++ b/erpnext/stock/dashboard/item_dashboard.js @@ -79,6 +79,7 @@ erpnext.stock.ItemDashboard = Class.extend({ }, get_item_dashboard_data: function(data, max_count, show_item) { if(!max_count) max_count = 0; + if(!data) data = []; data.forEach(function(d) { d.actual_or_pending = d.projected_qty + d.reserved_qty + d.reserved_qty_for_production; d.pending_qty = 0;