Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '4.0.0-wip' of github.com:webnotes/erpnext into 4.0-hotfix

Browse Source
This commit is contained in:
Akhilesh Darjee 2014-02-03 13:56:10 +05:30
commit dd905fcaba
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/public/js/conf.js
View File

@ -15,7 +15,6 @@ $(document).bind('toolbar_setup', function() {
.addClass("navbar-icon-home") .addClass("navbar-icon-home")
.css({ .css({
"max-width": "200px", "max-width": "200px",
"overflow": "hidden",
"text-overflow": "ellipsis", "text-overflow": "ellipsis",
"white-space": "nowrap" "white-space": "nowrap"
}); });

16
erpnext/utilities/doctype/address/address.txt
View File

@ -2,7 +2,7 @@
{ {
"creation": "2013-01-10 16:34:32", "creation": "2013-01-10 16:34:32",
"docstatus": 0, "docstatus": 0,
"modified": "2013-12-20 19:23:54", "modified": "2014-01-27 11:19:06",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -26,7 +26,9 @@
"permlevel": 0 "permlevel": 0
}, },
{ {
"cancel": 0,
"create": 1, "create": 1,
"delete": 0,
"doctype": "DocPerm", "doctype": "DocPerm",
"email": 1, "email": 1,
"name": "__common__", "name": "__common__",
@ -56,6 +58,7 @@
"doctype": "DocField", "doctype": "DocField",
"fieldname": "address_title", "fieldname": "address_title",
"fieldtype": "Data", "fieldtype": "Data",
"in_list_view": 1,
"label": "Address Title", "label": "Address Title",
"reqd": 0 "reqd": 0
}, },
@ -95,6 +98,7 @@
"fieldname": "state", "fieldname": "state",
"fieldtype": "Data", "fieldtype": "Data",
"in_filter": 1, "in_filter": 1,
"in_list_view": 1,
"label": "State", "label": "State",
"options": "Suggest", "options": "Suggest",
"search_index": 0 "search_index": 0
@ -104,6 +108,7 @@
"fieldname": "pincode", "fieldname": "pincode",
"fieldtype": "Data", "fieldtype": "Data",
"in_filter": 1, "in_filter": 1,
"in_list_view": 1,
"label": "Pincode", "label": "Pincode",
"search_index": 1 "search_index": 1
}, },
@ -170,7 +175,6 @@
"options": "icon-pushpin" "options": "icon-pushpin"
}, },
{ {
"depends_on": "eval:!doc.supplier && !doc.sales_partner",
"doctype": "DocField", "doctype": "DocField",
"fieldname": "customer", "fieldname": "customer",
"fieldtype": "Link", "fieldtype": "Link",
@ -178,17 +182,15 @@
"options": "Customer" "options": "Customer"
}, },
{ {
"depends_on": "eval:!doc.supplier && !doc.sales_partner",
"doctype": "DocField", "doctype": "DocField",
"fieldname": "customer_name", "fieldname": "customer_name",
"fieldtype": "Data", "fieldtype": "Data",
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 0,
"label": "Customer Name", "label": "Customer Name",
"read_only": 1 "read_only": 1
}, },
{ {
"depends_on": "eval:!doc.customer && !doc.sales_partner && !doc.lead",
"doctype": "DocField", "doctype": "DocField",
"fieldname": "supplier", "fieldname": "supplier",
"fieldtype": "Link", "fieldtype": "Link",
@ -196,18 +198,16 @@
"options": "Supplier" "options": "Supplier"
}, },
{ {
"depends_on": "eval:!doc.customer && !doc.sales_partner && !doc.lead",
"doctype": "DocField", "doctype": "DocField",
"fieldname": "supplier_name", "fieldname": "supplier_name",
"fieldtype": "Data", "fieldtype": "Data",
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 0,
"label": "Supplier Name", "label": "Supplier Name",
"read_only": 1, "read_only": 1,
"search_index": 0 "search_index": 0
}, },
{ {
"depends_on": "eval:!doc.customer && !doc.supplier && !doc.lead",
"doctype": "DocField", "doctype": "DocField",
"fieldname": "sales_partner", "fieldname": "sales_partner",
"fieldtype": "Link", "fieldtype": "Link",