diff --git a/erpnext/public/js/utils.js b/erpnext/public/js/utils.js index 622e1c4ee19..12eb5fb7bab 100644 --- a/erpnext/public/js/utils.js +++ b/erpnext/public/js/utils.js @@ -31,9 +31,13 @@ $.extend(erpnext, { add_applicable_territory: function() { if(cur_frm.doc.__islocal && frappe.model.get_doclist(cur_frm.doc.doctype, cur_frm.doc.name).length === 1) { - var territory = frappe.model.add_child(cur_frm.doc, "Applicable Territory", - "valid_for_territories"); - territory.territory = frappe.defaults.get_default("territory"); + var default_territory = frappe.defaults.get_default("territory"); + if(default_territory) { + var territory = frappe.model.add_child(cur_frm.doc, "Applicable Territory", + "valid_for_territories"); + territory.territory = default_territory; + } + } }, diff --git a/erpnext/stock/doctype/item/item.txt b/erpnext/stock/doctype/item/item.txt index db8310301f4..63af80d56f2 100644 --- a/erpnext/stock/doctype/item/item.txt +++ b/erpnext/stock/doctype/item/item.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-03 10:45:46", "docstatus": 0, - "modified": "2014-02-10 17:27:49", + "modified": "2014-02-19 11:04:00", "modified_by": "Administrator", "owner": "Administrator" }, @@ -271,7 +271,7 @@ "doctype": "DocField", "fieldname": "is_asset_item", "fieldtype": "Select", - "label": "Is Asset Item", + "label": "Is Fixed Asset Item", "oldfieldname": "is_asset_item", "oldfieldtype": "Select", "options": "Yes\nNo",