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-05-24 19:29:09",
"docstatus": 0,
"modified": "2013-06-27 11:33:53",
"modified": "2013-07-05 10:43:08",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -41,6 +41,13 @@
"doctype": "DocType",
"name": "Delivery Note"
},
{
"doctype": "DocField",
"fieldname": "delivery_to_section",
"fieldtype": "Section Break",
"label": "Delivery To",
"options": "icon-user"
},
{
"doctype": "DocField",
"fieldname": "column_break0",
@@ -100,38 +107,34 @@
"read_only": 1
},
{
"depends_on": "customer",
"doctype": "DocField",
"fieldname": "address_display",
"fieldtype": "Small Text",
"hidden": 0,
"hidden": 1,
"label": "Shipping Address",
"read_only": 1
},
{
"depends_on": "customer",
"doctype": "DocField",
"fieldname": "contact_display",
"fieldtype": "Small Text",
"hidden": 0,
"hidden": 1,
"label": "Contact",
"read_only": 1
},
{
"depends_on": "customer",
"doctype": "DocField",
"fieldname": "contact_mobile",
"fieldtype": "Text",
"hidden": 0,
"hidden": 1,
"label": "Mobile No",
"read_only": 1
},
{
"depends_on": "customer",
"doctype": "DocField",
"fieldname": "contact_email",
"fieldtype": "Text",
"hidden": 0,
"hidden": 1,
"label": "Contact Email",
"print_hide": 1,
"read_only": 1
@@ -248,6 +251,7 @@
"fieldname": "sec_break25",
"fieldtype": "Section Break",
"label": "Price List and Currency",
"options": "icon-tag",
"read_only": 0
},
{
@@ -323,6 +327,7 @@
"fieldtype": "Section Break",
"label": "Items",
"oldfieldtype": "Section Break",
"options": "icon-shopping-cart",
"read_only": 0
},
{
@@ -345,6 +350,7 @@
"fieldtype": "Section Break",
"label": "Packing List",
"oldfieldtype": "Section Break",
"options": "icon-suitcase",
"print_hide": 1,
"read_only": 0
},
@@ -371,7 +377,6 @@
"doctype": "DocField",
"fieldname": "section_break0",
"fieldtype": "Section Break",
"options": "Simple",
"read_only": 0
},
{
@@ -442,6 +447,7 @@
"fieldtype": "Section Break",
"label": "Taxes",
"oldfieldtype": "Section Break",
"options": "icon-money",
"read_only": 0
},
{
@@ -542,6 +548,7 @@
"fieldtype": "Section Break",
"label": "Totals",
"oldfieldtype": "Section Break",
"options": "icon-money",
"print_hide": 0,
"read_only": 0
},
@@ -644,6 +651,7 @@
"fieldtype": "Section Break",
"label": "Terms and Conditions",
"oldfieldtype": "Section Break",
"options": "icon-legal",
"read_only": 0
},
{
@@ -690,6 +698,7 @@
"fieldname": "transporter_info",
"fieldtype": "Section Break",
"label": "Transporter Info",
"options": "icon-truck",
"print_hide": 1,
"read_only": 0
},
@@ -751,6 +760,7 @@
"fieldname": "contact_info",
"fieldtype": "Section Break",
"label": "Contact Info",
"options": "icon-bullhorn",
"read_only": 0
},
{
@@ -802,6 +812,7 @@
"fieldtype": "Section Break",
"label": "More Info",
"oldfieldtype": "Section Break",
"options": "icon-file-text",
"print_hide": 1,
"read_only": 0
},
@@ -1040,6 +1051,7 @@
"fieldtype": "Section Break",
"label": "Sales Team",
"oldfieldtype": "Section Break",
"options": "icon-group",
"print_hide": 1,
"read_only": 0
},
@@ -1095,7 +1107,6 @@
"doctype": "DocField",
"fieldname": "section_break1",
"fieldtype": "Section Break",
"options": "Simple",
"print_hide": 1,
"read_only": 0
},

View File

@@ -2,7 +2,7 @@
{
"creation": "2013-05-03 10:45:46",
"docstatus": 0,
"modified": "2013-07-01 11:45:59",
"modified": "2013-07-05 10:24:36",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -44,11 +44,12 @@
},
{
"doctype": "DocField",
"fieldname": "item",
"fieldname": "name_and_description_section",
"fieldtype": "Section Break",
"label": "Item",
"label": "Name and Description",
"no_copy": 0,
"oldfieldtype": "Section Break",
"options": "icon-flag",
"read_only": 0
},
{
@@ -188,6 +189,7 @@
"fieldtype": "Section Break",
"label": "Inventory",
"oldfieldtype": "Section Break",
"options": "icon-truck",
"read_only": 0
},
{
@@ -343,6 +345,7 @@
"fieldname": "reorder_section",
"fieldtype": "Section Break",
"label": "Re-order",
"options": "icon-rss",
"read_only": 0
},
{
@@ -367,7 +370,6 @@
"doctype": "DocField",
"fieldname": "section_break_31",
"fieldtype": "Section Break",
"options": "Simple",
"read_only": 0
},
{
@@ -384,6 +386,7 @@
"fieldtype": "Section Break",
"label": "Purchase Details",
"oldfieldtype": "Section Break",
"options": "icon-shopping-cart",
"read_only": 0
},
{
@@ -508,6 +511,7 @@
"fieldtype": "Section Break",
"label": "Sales Details",
"oldfieldtype": "Section Break",
"options": "icon-tag",
"read_only": 0
},
{
@@ -617,6 +621,7 @@
"fieldtype": "Section Break",
"label": "Item Tax",
"oldfieldtype": "Section Break",
"options": "icon-money",
"read_only": 0
},
{
@@ -634,6 +639,7 @@
"fieldname": "price_list_section",
"fieldtype": "Section Break",
"label": "Price Lists and Rates",
"options": "icon-money",
"read_only": 0
},
{
@@ -653,6 +659,7 @@
"fieldtype": "Section Break",
"label": "Inspection Criteria",
"oldfieldtype": "Section Break",
"options": "icon-search",
"read_only": 0
},
{
@@ -686,6 +693,7 @@
"fieldtype": "Section Break",
"label": "Manufacturing",
"oldfieldtype": "Section Break",
"options": "icon-cogs",
"read_only": 0
},
{
@@ -756,6 +764,7 @@
"fieldname": "website_section",
"fieldtype": "Section Break",
"label": "Website",
"options": "icon-globe",
"read_only": 0
},
{

View File

@@ -2,7 +2,7 @@
{
"creation": "2013-05-21 16:16:39",
"docstatus": 0,
"modified": "2013-06-11 16:16:40",
"modified": "2013-07-05 10:46:56",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -39,6 +39,13 @@
"doctype": "DocType",
"name": "Purchase Receipt"
},
{
"doctype": "DocField",
"fieldname": "supplier_section",
"fieldtype": "Section Break",
"label": "Supplier",
"options": "icon-user"
},
{
"doctype": "DocField",
"fieldname": "column_break0",
@@ -87,38 +94,34 @@
"read_only": 1
},
{
"depends_on": "supplier",
"doctype": "DocField",
"fieldname": "address_display",
"fieldtype": "Small Text",
"hidden": 0,
"hidden": 1,
"label": "Address",
"read_only": 1
},
{
"depends_on": "supplier",
"doctype": "DocField",
"fieldname": "contact_display",
"fieldtype": "Small Text",
"hidden": 0,
"hidden": 1,
"label": "Contact",
"read_only": 1
},
{
"depends_on": "supplier",
"doctype": "DocField",
"fieldname": "contact_mobile",
"fieldtype": "Text",
"hidden": 0,
"hidden": 1,
"label": "Mobile No",
"read_only": 1
},
{
"depends_on": "supplier",
"doctype": "DocField",
"fieldname": "contact_email",
"fieldtype": "Text",
"hidden": 0,
"hidden": 1,
"label": "Contact Email",
"print_hide": 1,
"read_only": 1
@@ -196,7 +199,8 @@
"fieldname": "items",
"fieldtype": "Section Break",
"label": "Items",
"oldfieldtype": "Section Break"
"oldfieldtype": "Section Break",
"options": "icon-shopping-cart"
},
{
"allow_on_submit": 1,
@@ -214,8 +218,7 @@
"doctype": "DocField",
"fieldname": "section_break0",
"fieldtype": "Section Break",
"oldfieldtype": "Section Break",
"options": "Simple"
"oldfieldtype": "Section Break"
},
{
"doctype": "DocField",
@@ -269,7 +272,8 @@
"doctype": "DocField",
"fieldname": "currency_price_list",
"fieldtype": "Section Break",
"label": "Currency & Price List"
"label": "Currency & Price List",
"options": "icon-tag"
},
{
"description": "Supplier's currency",
@@ -336,7 +340,8 @@
"fieldname": "taxes",
"fieldtype": "Section Break",
"label": "Taxes",
"oldfieldtype": "Section Break"
"oldfieldtype": "Section Break",
"options": "icon-money"
},
{
"description": "If you have created a standard template in Purchase Taxes and Charges Master, select one and click on the button below.",
@@ -389,7 +394,8 @@
"fieldname": "totals",
"fieldtype": "Section Break",
"label": "Totals",
"oldfieldtype": "Section Break"
"oldfieldtype": "Section Break",
"options": "icon-money"
},
{
"doctype": "DocField",
@@ -538,7 +544,8 @@
"fieldname": "terms_section_break",
"fieldtype": "Section Break",
"label": "Terms and Conditions",
"oldfieldtype": "Section Break"
"oldfieldtype": "Section Break",
"options": "icon-legal"
},
{
"doctype": "DocField",
@@ -570,7 +577,8 @@
"doctype": "DocField",
"fieldname": "contact_section",
"fieldtype": "Section Break",
"label": "Contact Info"
"label": "Contact Info",
"options": "icon-bullhorn"
},
{
"doctype": "DocField",
@@ -599,7 +607,8 @@
"fieldname": "more_info",
"fieldtype": "Section Break",
"label": "More Info",
"oldfieldtype": "Section Break"
"oldfieldtype": "Section Break",
"options": "icon-file-text"
},
{
"doctype": "DocField",
@@ -803,7 +812,8 @@
"doctype": "DocField",
"fieldname": "transporter_info",
"fieldtype": "Section Break",
"label": "Transporter Info"
"label": "Transporter Info",
"options": "icon-truck"
},
{
"doctype": "DocField",
@@ -851,8 +861,9 @@
"doctype": "DocField",
"fieldname": "raw_material_details",
"fieldtype": "Section Break",
"label": "Raw Material Details",
"label": "Raw Materials Supplied",
"oldfieldtype": "Section Break",
"options": "icon-table",
"print_hide": 1,
"read_only": 1
},