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 fixes

Browse Source
This commit is contained in:
Nabin Hait
2014-02-19 11:04:32 +05:30
parent 36a4db69b8
commit 05b28eb161
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
erpnext/public/js/utils.js
View File

@@ -31,9 +31,13 @@ $.extend(erpnext, {
add_applicable_territory: function() { add_applicable_territory: function() {
if(cur_frm.doc.__islocal && if(cur_frm.doc.__islocal &&
frappe.model.get_doclist(cur_frm.doc.doctype, cur_frm.doc.name).length === 1) { 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", var default_territory = frappe.defaults.get_default("territory");
"valid_for_territories"); if(default_territory) {
territory.territory = frappe.defaults.get_default("territory"); var territory = frappe.model.add_child(cur_frm.doc, "Applicable Territory",
"valid_for_territories");
territory.territory = default_territory;
}
} }
}, },

4
erpnext/stock/doctype/item/item.txt
View File

@@ -2,7 +2,7 @@
{ {
"creation": "2013-05-03 10:45:46", "creation": "2013-05-03 10:45:46",
"docstatus": 0, "docstatus": 0,
"modified": "2014-02-10 17:27:49", "modified": "2014-02-19 11:04:00",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@@ -271,7 +271,7 @@
"doctype": "DocField", "doctype": "DocField",
"fieldname": "is_asset_item", "fieldname": "is_asset_item",
"fieldtype": "Select", "fieldtype": "Select",
"label": "Is Asset Item", "label": "Is Fixed Asset Item",
"oldfieldname": "is_asset_item", "oldfieldname": "is_asset_item",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "Yes\nNo", "options": "Yes\nNo",