Merge branch 'responsive' of github.com:webnotes/erpnext into responsive

This commit is contained in:
Anand Doshi
2013-07-05 12:57:41 +05:30
15 changed files with 219 additions and 117 deletions

View File

@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:32",
"docstatus": 0,
"modified": "2013-07-01 17:25:00",
"modified": "2013-07-05 11:45:06",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -39,6 +39,13 @@
"doctype": "DocType",
"name": "Address"
},
{
"doctype": "DocField",
"fieldname": "address_details",
"fieldtype": "Section Break",
"label": "Address Details",
"options": "icon-map-marker"
},
{
"description": "Name of person or organization that this address belongs to.",
"doctype": "DocField",
@@ -154,7 +161,8 @@
"doctype": "DocField",
"fieldname": "linked_with",
"fieldtype": "Section Break",
"label": "Linked With"
"label": "Reference",
"options": "icon-pushpin"
},
{
"depends_on": "eval:!doc.supplier && !doc.sales_partner",

View File

@@ -2,7 +2,7 @@
{
"creation": "2013-01-10 16:34:32",
"docstatus": 0,
"modified": "2013-02-11 14:32:13",
"modified": "2013-07-05 11:43:50",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -39,6 +39,13 @@
"doctype": "DocType",
"name": "Contact"
},
{
"doctype": "DocField",
"fieldname": "contact_section",
"fieldtype": "Section Break",
"label": "Contact Details",
"options": "icon-user"
},
{
"doctype": "DocField",
"fieldname": "first_name",
@@ -91,7 +98,9 @@
{
"doctype": "DocField",
"fieldname": "sb00",
"fieldtype": "Section Break"
"fieldtype": "Section Break",
"label": "Communication History",
"options": "icon-comments"
},
{
"doctype": "DocField",
@@ -103,7 +112,8 @@
"doctype": "DocField",
"fieldname": "contact_details",
"fieldtype": "Section Break",
"label": "Contact Details"
"label": "Reference",
"options": "icon-pushpin"
},
{
"depends_on": "eval:!doc.supplier && !doc.sales_partner",
@@ -125,6 +135,13 @@
"label": "Customer Name",
"read_only": 1
},
{
"doctype": "DocField",
"fieldname": "column_break1",
"fieldtype": "Column Break",
"oldfieldtype": "Column Break",
"width": "50%"
},
{
"depends_on": "eval:!doc.customer && !doc.sales_partner",
"doctype": "DocField",
@@ -163,10 +180,10 @@
},
{
"doctype": "DocField",
"fieldname": "column_break1",
"fieldtype": "Column Break",
"oldfieldtype": "Column Break",
"width": "50%"
"fieldname": "more_info",
"fieldtype": "Section Break",
"label": "More Info",
"options": "icon-file-text"
},
{
"doctype": "DocField",