Merge branch 'responsive' of github.com:webnotes/erpnext into responsive
diff --git a/accounts/doctype/journal_voucher/journal_voucher.txt b/accounts/doctype/journal_voucher/journal_voucher.txt
index 603eb99..1833535 100644
--- a/accounts/doctype/journal_voucher/journal_voucher.txt
+++ b/accounts/doctype/journal_voucher/journal_voucher.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-03-25 10:53:52",
"docstatus": 0,
- "modified": "2013-06-28 14:27:11",
+ "modified": "2013-07-05 10:27:45",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -39,6 +39,13 @@
},
{
"doctype": "DocField",
+ "fieldname": "voucher_type_and_date",
+ "fieldtype": "Section Break",
+ "label": "Voucher Type and Date",
+ "options": "icon-flag"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "column_break0",
"fieldtype": "Column Break",
"oldfieldtype": "Column Break",
@@ -102,7 +109,7 @@
"fieldtype": "Section Break",
"label": "Journal Entries",
"oldfieldtype": "Section Break",
- "options": "Simple",
+ "options": "icon-table",
"read_only": 0
},
{
@@ -121,7 +128,6 @@
"doctype": "DocField",
"fieldname": "section_break99",
"fieldtype": "Section Break",
- "options": "Simple",
"read_only": 0
},
{
@@ -180,6 +186,7 @@
"fieldname": "reference",
"fieldtype": "Section Break",
"label": "Reference",
+ "options": "icon-pushpin",
"read_only": 0
},
{
@@ -286,6 +293,7 @@
"fieldtype": "Section Break",
"label": "More Info",
"oldfieldtype": "Section Break",
+ "options": "icon-file-text",
"read_only": 0
},
{
diff --git a/accounts/doctype/purchase_invoice/purchase_invoice.txt b/accounts/doctype/purchase_invoice/purchase_invoice.txt
index c3b5061..efe04ef 100755
--- a/accounts/doctype/purchase_invoice/purchase_invoice.txt
+++ b/accounts/doctype/purchase_invoice/purchase_invoice.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-21 16:16:39",
"docstatus": 0,
- "modified": "2013-06-11 16:16:38",
+ "modified": "2013-07-05 10:40:16",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -40,6 +40,13 @@
},
{
"doctype": "DocField",
+ "fieldname": "supplier_section",
+ "fieldtype": "Section Break",
+ "label": "Supplier",
+ "options": "icon-user"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "column_break0",
"fieldtype": "Column Break",
"oldfieldtype": "Column Break",
@@ -101,38 +108,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
@@ -195,6 +198,7 @@
"fieldtype": "Section Break",
"label": "Items",
"oldfieldtype": "Section Break",
+ "options": "icon-shopping-cart",
"read_only": 0
},
{
@@ -226,7 +230,6 @@
"doctype": "DocField",
"fieldname": "section_break_17",
"fieldtype": "Section Break",
- "options": "Simple",
"read_only": 0
},
{
@@ -267,6 +270,7 @@
"fieldname": "currency_price_list",
"fieldtype": "Section Break",
"label": "Currency & Price List",
+ "options": "icon-tag",
"read_only": 0
},
{
@@ -334,6 +338,7 @@
"fieldtype": "Section Break",
"label": "Taxes",
"oldfieldtype": "Section Break",
+ "options": "icon-money",
"read_only": 0
},
{
@@ -402,6 +407,7 @@
"fieldname": "contact_section",
"fieldtype": "Section Break",
"label": "Contact Info",
+ "options": "icon-bullhorn",
"read_only": 0
},
{
@@ -434,6 +440,7 @@
"fieldtype": "Section Break",
"label": "Totals",
"oldfieldtype": "Section Break",
+ "options": "icon-money",
"read_only": 0
},
{
@@ -647,6 +654,7 @@
"fieldtype": "Section Break",
"label": "Advances",
"oldfieldtype": "Section Break",
+ "options": "icon-money",
"print_hide": 1,
"read_only": 0
},
@@ -676,7 +684,8 @@
"doctype": "DocField",
"fieldname": "terms_section_break",
"fieldtype": "Section Break",
- "label": "Terms and Conditions"
+ "label": "Terms and Conditions",
+ "options": "icon-legal"
},
{
"doctype": "DocField",
@@ -704,6 +713,7 @@
"fieldtype": "Section Break",
"label": "More Info",
"oldfieldtype": "Section Break",
+ "options": "icon-file-text",
"print_hide": 1,
"read_only": 0
},
diff --git a/accounts/doctype/sales_invoice/sales_invoice.txt b/accounts/doctype/sales_invoice/sales_invoice.txt
index 81b0785..41191ff 100644
--- a/accounts/doctype/sales_invoice/sales_invoice.txt
+++ b/accounts/doctype/sales_invoice/sales_invoice.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-05-24 19:29:05",
"docstatus": 0,
- "modified": "2013-06-27 11:35:29",
+ "modified": "2013-07-05 10:37:41",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -40,6 +40,13 @@
"name": "Sales Invoice"
},
{
+ "doctype": "DocField",
+ "fieldname": "customer_section",
+ "fieldtype": "Section Break",
+ "label": "Customer",
+ "options": "icon-user"
+ },
+ {
"description": "To manage multiple series please go to Setup > Manage Series",
"doctype": "DocField",
"fieldname": "naming_series",
@@ -94,38 +101,34 @@
"read_only": 1
},
{
- "depends_on": "customer",
"doctype": "DocField",
"fieldname": "address_display",
"fieldtype": "Small Text",
- "hidden": 0,
+ "hidden": 1,
"label": "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
@@ -139,6 +142,16 @@
},
{
"doctype": "DocField",
+ "fieldname": "is_pos",
+ "fieldtype": "Check",
+ "label": "Is POS",
+ "oldfieldname": "is_pos",
+ "oldfieldtype": "Check",
+ "print_hide": 1,
+ "read_only": 0
+ },
+ {
+ "doctype": "DocField",
"fieldname": "amended_from",
"fieldtype": "Link",
"label": "Amended From",
@@ -207,29 +220,10 @@
},
{
"doctype": "DocField",
- "fieldname": "is_pos",
- "fieldtype": "Check",
- "label": "Is POS",
- "oldfieldname": "is_pos",
- "oldfieldtype": "Check",
- "print_hide": 1,
- "read_only": 0
- },
- {
- "doctype": "DocField",
- "fieldname": "update_stock",
- "fieldtype": "Check",
- "label": "Update Stock",
- "oldfieldname": "update_stock",
- "oldfieldtype": "Check",
- "print_hide": 1,
- "read_only": 0
- },
- {
- "doctype": "DocField",
"fieldname": "currency_section",
"fieldtype": "Section Break",
"label": "Price List and Currency",
+ "options": "icon-tag",
"read_only": 0
},
{
@@ -304,6 +298,17 @@
"fieldtype": "Section Break",
"label": "Items",
"oldfieldtype": "Section Break",
+ "options": "icon-shopping-cart",
+ "read_only": 0
+ },
+ {
+ "doctype": "DocField",
+ "fieldname": "update_stock",
+ "fieldtype": "Check",
+ "label": "Update Stock",
+ "oldfieldname": "update_stock",
+ "oldfieldtype": "Check",
+ "print_hide": 1,
"read_only": 0
},
{
@@ -323,6 +328,7 @@
"fieldname": "packing_list",
"fieldtype": "Section Break",
"label": "Packing List",
+ "options": "icon-suitcase",
"print_hide": 1,
"read_only": 0
},
@@ -347,7 +353,6 @@
"doctype": "DocField",
"fieldname": "section_break0",
"fieldtype": "Section Break",
- "options": "Simple",
"read_only": 0
},
{
@@ -426,6 +431,7 @@
"fieldtype": "Section Break",
"label": "Taxes and Charges",
"oldfieldtype": "Section Break",
+ "options": "icon-money",
"read_only": 0
},
{
@@ -524,6 +530,7 @@
"fieldtype": "Section Break",
"label": "Totals",
"oldfieldtype": "Section Break",
+ "options": "icon-money",
"print_hide": 1,
"read_only": 0
},
@@ -657,6 +664,7 @@
"fieldtype": "Section Break",
"label": "Advances",
"oldfieldtype": "Section Break",
+ "options": "icon-money",
"print_hide": 1,
"read_only": 0
},
@@ -686,6 +694,7 @@
"fieldname": "payments_section",
"fieldtype": "Section Break",
"label": "Payments",
+ "options": "icon-money",
"read_only": 0
},
{
@@ -765,6 +774,7 @@
"fieldtype": "Section Break",
"label": "Terms and Conditions",
"oldfieldtype": "Section Break",
+ "options": "icon-legal",
"read_only": 0
},
{
@@ -813,6 +823,7 @@
"fieldtype": "Section Break",
"hidden": 0,
"label": "Contact Info",
+ "options": "icon-bullhorn",
"read_only": 0
},
{
@@ -869,6 +880,7 @@
"fieldtype": "Section Break",
"label": "More Info",
"oldfieldtype": "Section Break",
+ "options": "icon-file-text",
"print_hide": 1,
"read_only": 0
},
@@ -1033,6 +1045,7 @@
"fieldtype": "Section Break",
"label": "Sales Team",
"oldfieldtype": "Section Break",
+ "options": "icon-group",
"print_hide": 1,
"read_only": 0
},
@@ -1091,7 +1104,6 @@
"doctype": "DocField",
"fieldname": "section_break2",
"fieldtype": "Section Break",
- "options": "Simple",
"print_hide": 1,
"read_only": 0
},
@@ -1112,6 +1124,7 @@
"fieldname": "recurring_invoice",
"fieldtype": "Section Break",
"label": "Recurring Invoice",
+ "options": "icon-time",
"print_hide": 1,
"read_only": 0
},
diff --git a/stock/doctype/delivery_note/delivery_note.txt b/stock/doctype/delivery_note/delivery_note.txt
index 20e2196..25430d0 100644
--- a/stock/doctype/delivery_note/delivery_note.txt
+++ b/stock/doctype/delivery_note/delivery_note.txt
@@ -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"
},
@@ -43,6 +43,13 @@
},
{
"doctype": "DocField",
+ "fieldname": "delivery_to_section",
+ "fieldtype": "Section Break",
+ "label": "Delivery To",
+ "options": "icon-user"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "column_break0",
"fieldtype": "Column Break",
"oldfieldtype": "Column Break",
@@ -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
},
diff --git a/stock/doctype/item/item.txt b/stock/doctype/item/item.txt
index d5fcb9e..099b532 100644
--- a/stock/doctype/item/item.txt
+++ b/stock/doctype/item/item.txt
@@ -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
},
{
diff --git a/stock/doctype/purchase_receipt/purchase_receipt.txt b/stock/doctype/purchase_receipt/purchase_receipt.txt
index 1fe2614..802d542 100755
--- a/stock/doctype/purchase_receipt/purchase_receipt.txt
+++ b/stock/doctype/purchase_receipt/purchase_receipt.txt
@@ -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"
},
@@ -41,6 +41,13 @@
},
{
"doctype": "DocField",
+ "fieldname": "supplier_section",
+ "fieldtype": "Section Break",
+ "label": "Supplier",
+ "options": "icon-user"
+ },
+ {
+ "doctype": "DocField",
"fieldname": "column_break0",
"fieldtype": "Column Break",
"oldfieldtype": "Column Break",
@@ -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
},