From e953f0bb971fbdd30647495386e39fb2428a46d5 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 5 Jul 2013 10:48:35 +0530 Subject: [PATCH 1/6] [form cleanup] journal voucher, purchase invoice, sales invoice, delivery note, item, purchase receipt --- .../journal_voucher/journal_voucher.txt | 14 +++- .../purchase_invoice/purchase_invoice.txt | 32 +++++--- .../doctype/sales_invoice/sales_invoice.txt | 75 +++++++++++-------- stock/doctype/delivery_note/delivery_note.txt | 33 +++++--- stock/doctype/item/item.txt | 17 ++++- .../purchase_receipt/purchase_receipt.txt | 51 ++++++++----- 6 files changed, 142 insertions(+), 80 deletions(-) diff --git a/accounts/doctype/journal_voucher/journal_voucher.txt b/accounts/doctype/journal_voucher/journal_voucher.txt index 603eb99fc0..183353555c 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" }, @@ -37,6 +37,13 @@ "doctype": "DocType", "name": "Journal Voucher" }, + { + "doctype": "DocField", + "fieldname": "voucher_type_and_date", + "fieldtype": "Section Break", + "label": "Voucher Type and Date", + "options": "icon-flag" + }, { "doctype": "DocField", "fieldname": "column_break0", @@ -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 c3b5061957..efe04ef3e6 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" }, @@ -38,6 +38,13 @@ "doctype": "DocType", "name": "Purchase Invoice" }, + { + "doctype": "DocField", + "fieldname": "supplier_section", + "fieldtype": "Section Break", + "label": "Supplier", + "options": "icon-user" + }, { "doctype": "DocField", "fieldname": "column_break0", @@ -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 81b078528e..41191ff911 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" }, @@ -39,6 +39,13 @@ "doctype": "DocType", "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", @@ -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 @@ -137,6 +140,16 @@ "oldfieldtype": "Column Break", "read_only": 0 }, + { + "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", @@ -205,31 +218,12 @@ "options": "link:Mode of Payment", "read_only": 0 }, - { - "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 20e2196cb0..25430d09ae 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" }, @@ -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 }, diff --git a/stock/doctype/item/item.txt b/stock/doctype/item/item.txt index d5fcb9ef28..099b532454 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 1fe26143db..802d542a02 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" }, @@ -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 }, From 54352c7140be723cec6d7370978c2ef6273cc987 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 5 Jul 2013 12:43:59 +0530 Subject: [PATCH 2/6] [form cleanup] --- .../bank_reconciliation.js | 2 ++ .../bank_reconciliation_detail.txt | 18 +++++------ .../doctype/sales_invoice/sales_invoice.js | 3 ++ hr/doctype/employee/employee.txt | 11 +------ selling/doctype/sales_order/sales_order.js | 2 +- .../doctype/customer_issue/customer_issue.txt | 19 +++++++++--- .../doctype/support_ticket/support_ticket.txt | 16 ++++++++-- utilities/doctype/address/address.txt | 12 +++++-- utilities/doctype/contact/contact.txt | 31 ++++++++++++++----- 9 files changed, 77 insertions(+), 37 deletions(-) diff --git a/accounts/doctype/bank_reconciliation/bank_reconciliation.js b/accounts/doctype/bank_reconciliation/bank_reconciliation.js index 51e62cccb2..793db62d07 100644 --- a/accounts/doctype/bank_reconciliation/bank_reconciliation.js +++ b/accounts/doctype/bank_reconciliation/bank_reconciliation.js @@ -17,4 +17,6 @@ cur_frm.add_fetch("bank_account", "company", "company"); cur_frm.cscript.onload = function(doc, cdt, cdn){ + cur_frm.set_intro(' ' + + wn._("Update clearance date of Journal Entries marked as 'Bank Vouchers'")) } diff --git a/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt b/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt index d814ad863c..11481d7dc8 100644 --- a/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt +++ b/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt @@ -2,7 +2,7 @@ { "creation": "2013-02-22 01:27:37", "docstatus": 0, - "modified": "2013-03-07 07:03:18", + "modified": "2013-07-05 11:05:59", "modified_by": "Administrator", "owner": "Administrator" }, @@ -54,6 +54,14 @@ "oldfieldtype": "Date", "read_only": 1 }, + { + "doctype": "DocField", + "fieldname": "clearance_date", + "fieldtype": "Date", + "label": "Clearance Date", + "oldfieldname": "clearance_date", + "oldfieldtype": "Date" + }, { "doctype": "DocField", "fieldname": "cheque_number", @@ -91,13 +99,5 @@ "oldfieldtype": "Currency", "options": "Company:company:default_currency", "read_only": 1 - }, - { - "doctype": "DocField", - "fieldname": "clearance_date", - "fieldtype": "Date", - "label": "Clearance Date", - "oldfieldname": "clearance_date", - "oldfieldtype": "Date" } ] \ No newline at end of file diff --git a/accounts/doctype/sales_invoice/sales_invoice.js b/accounts/doctype/sales_invoice/sales_invoice.js index 0ac1b5e4e5..6989ad274b 100644 --- a/accounts/doctype/sales_invoice/sales_invoice.js +++ b/accounts/doctype/sales_invoice/sales_invoice.js @@ -43,6 +43,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte this._super(); cur_frm.cscript.is_opening(doc, dt, dn); + cur_frm.dashboard.reset(); if(doc.docstatus==1) { cur_frm.add_custom_button('View Ledger', function() { @@ -53,6 +54,8 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte }; wn.set_route("general-ledger"); }); + + cur_frm.dashboard.add_progress() cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms); diff --git a/hr/doctype/employee/employee.txt b/hr/doctype/employee/employee.txt index 705eaa7273..b22fcb9959 100644 --- a/hr/doctype/employee/employee.txt +++ b/hr/doctype/employee/employee.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-07 09:04:18", "docstatus": 0, - "modified": "2013-04-12 07:16:42", + "modified": "2013-07-05 11:23:07", "modified_by": "Administrator", "owner": "Administrator" }, @@ -608,12 +608,6 @@ "label": "Educational Qualification Details", "options": "Employee Education" }, - { - "doctype": "DocField", - "fieldname": "career_history", - "fieldtype": "Section Break", - "label": "Career History" - }, { "doctype": "DocField", "fieldname": "previous_work_experience", @@ -762,7 +756,6 @@ "cancel": 0, "create": 0, "doctype": "DocPerm", - "match": "", "permlevel": 1, "report": 0, "role": "Employee", @@ -791,7 +784,6 @@ "cancel": 0, "create": 0, "doctype": "DocPerm", - "match": "", "permlevel": 1, "report": 0, "role": "HR User", @@ -801,7 +793,6 @@ "cancel": 0, "create": 0, "doctype": "DocPerm", - "match": "", "permlevel": 1, "report": 0, "role": "HR Manager", diff --git a/selling/doctype/sales_order/sales_order.js b/selling/doctype/sales_order/sales_order.js index 4bb2fa36e9..1bf562e15e 100644 --- a/selling/doctype/sales_order/sales_order.js +++ b/selling/doctype/sales_order/sales_order.js @@ -36,7 +36,7 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( cur_frm.dashboard.add_progress(cint(doc.per_delivered) + wn._("% Delivered"), doc.per_delivered); - cur_frm.dashboard.add_progress(cint(doc.per_delivered) + wn._("% Billed"), + cur_frm.dashboard.add_progress(cint(doc.per_billed) + wn._("% Billed"), doc.per_billed); cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms); diff --git a/support/doctype/customer_issue/customer_issue.txt b/support/doctype/customer_issue/customer_issue.txt index c60df62d08..2f6743710b 100644 --- a/support/doctype/customer_issue/customer_issue.txt +++ b/support/doctype/customer_issue/customer_issue.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:30", "docstatus": 0, - "modified": "2013-06-11 16:16:33", + "modified": "2013-07-05 12:31:46", "modified_by": "Administrator", "owner": "harshada@webnotestech.com" }, @@ -38,6 +38,13 @@ "doctype": "DocType", "name": "Customer Issue" }, + { + "doctype": "DocField", + "fieldname": "customer_section", + "fieldtype": "Section Break", + "label": "Customer", + "options": "icon-user" + }, { "doctype": "DocField", "fieldname": "naming_series", @@ -121,7 +128,7 @@ "fieldtype": "Section Break", "label": "Issue Details", "oldfieldtype": "Section Break", - "options": "Simple" + "options": "icon-ticket" }, { "doctype": "DocField", @@ -212,7 +219,7 @@ "fieldtype": "Section Break", "label": "Resolution", "oldfieldtype": "Section Break", - "options": "Simple" + "options": "icon-thumbs-up" }, { "doctype": "DocField", @@ -250,7 +257,8 @@ "doctype": "DocField", "fieldname": "contact_info", "fieldtype": "Section Break", - "label": "Contact Info" + "label": "Contact Info", + "options": "icon-bullhorn" }, { "doctype": "DocField", @@ -333,7 +341,8 @@ "doctype": "DocField", "fieldname": "more_info", "fieldtype": "Section Break", - "label": "More Info" + "label": "More Info", + "options": "icon-file-text" }, { "doctype": "DocField", diff --git a/support/doctype/support_ticket/support_ticket.txt b/support/doctype/support_ticket/support_ticket.txt index 50e547ece7..491074f9ea 100644 --- a/support/doctype/support_ticket/support_ticket.txt +++ b/support/doctype/support_ticket/support_ticket.txt @@ -2,7 +2,7 @@ { "creation": "2013-02-01 10:36:25", "docstatus": 0, - "modified": "2013-05-21 16:27:46", + "modified": "2013-07-05 12:27:54", "modified_by": "Administrator", "owner": "Administrator" }, @@ -40,6 +40,13 @@ "doctype": "DocType", "name": "Support Ticket" }, + { + "doctype": "DocField", + "fieldname": "subject_section", + "fieldtype": "Section Break", + "label": "Subject", + "options": "icon-flag" + }, { "doctype": "DocField", "fieldname": "naming_series", @@ -99,7 +106,9 @@ { "doctype": "DocField", "fieldname": "sb00", - "fieldtype": "Section Break" + "fieldtype": "Section Break", + "label": "Messages", + "options": "icon-comments" }, { "depends_on": "eval:doc.__islocal", @@ -123,7 +132,8 @@ "doctype": "DocField", "fieldname": "additional_info", "fieldtype": "Section Break", - "label": "Additional Info", + "label": "Reference", + "options": "icon-pushpin", "read_only": 1 }, { diff --git a/utilities/doctype/address/address.txt b/utilities/doctype/address/address.txt index 5e09daadd0..1f65794fb7 100644 --- a/utilities/doctype/address/address.txt +++ b/utilities/doctype/address/address.txt @@ -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", diff --git a/utilities/doctype/contact/contact.txt b/utilities/doctype/contact/contact.txt index 580a9fce60..d9e95266dd 100644 --- a/utilities/doctype/contact/contact.txt +++ b/utilities/doctype/contact/contact.txt @@ -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", From 901773a13991b04c30e1c7a5f86e4271a3620faf Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 5 Jul 2013 12:57:03 +0530 Subject: [PATCH 3/6] [fresh install] [fix] replace allow roles with explicit has_permission checks for doctype py files --- accounts/doctype/mis_control/mis_control.py | 5 ++--- .../upload_attendance/upload_attendance.py | 10 ++++++++-- .../stock_ledger_entry/stock_ledger_entry.py | 17 +++++++++-------- utilities/doctype/rename_tool/rename_tool.py | 5 ++++- 4 files changed, 23 insertions(+), 14 deletions(-) diff --git a/accounts/doctype/mis_control/mis_control.py b/accounts/doctype/mis_control/mis_control.py index 17971fe184..35d2bc2cbf 100644 --- a/accounts/doctype/mis_control/mis_control.py +++ b/accounts/doctype/mis_control/mis_control.py @@ -35,8 +35,6 @@ class DocType: self.account_list = [] self.ac_details = {} # key: account id, values: debit_or_credit, lft, rgt - self.roles = webnotes.user.get_roles() - self.period_list = [] self.period_start_date = {} self.period_end_date = {} @@ -44,7 +42,7 @@ class DocType: self.fs_list = [] self.root_bal = [] self.flag = 0 - + # Get defaults on load of MIS, MIS - Comparison Report and Financial statements # ---------------------------------------------------- def get_comp(self): @@ -75,6 +73,7 @@ class DocType: ret['month'] = mon # ------------------------ get MIS Type on basis of roles of session user ------------------------------------------ + self.roles = webnotes.user.get_roles() if has_common(self.roles, ['Sales Manager']): type.append('Sales') if has_common(self.roles, ['Purchase Manager']): diff --git a/hr/doctype/upload_attendance/upload_attendance.py b/hr/doctype/upload_attendance/upload_attendance.py index ee4234a279..54b8e49b09 100644 --- a/hr/doctype/upload_attendance/upload_attendance.py +++ b/hr/doctype/upload_attendance/upload_attendance.py @@ -13,8 +13,11 @@ class DocType(): self.doc = doc self.doclist = doclist -@webnotes.whitelist(allow_roles=['System Manager', 'HR Manager', "HR User"]) +@webnotes.whitelist() def get_template(): + if not webnotes.has_permission("Attendance", "create"): + raise webnotes.PermissionError + args = webnotes.form_dict global doclist doclist = webnotes.model.doctype.get("Attendance") @@ -96,8 +99,11 @@ def get_naming_series(): return series[0] -@webnotes.whitelist(allow_roles=['System Manager', 'HR Manager', "HR User"]) +@webnotes.whitelist() def upload(): + if not webnotes.has_permission("Attendance", "create"): + raise webnotes.PermissionError + from webnotes.utils.datautils import read_csv_content_from_uploaded_file from webnotes.modules import scrub diff --git a/stock/doctype/stock_ledger_entry/stock_ledger_entry.py b/stock/doctype/stock_ledger_entry/stock_ledger_entry.py index b2a10853ac..c216c42631 100644 --- a/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +++ b/stock/doctype/stock_ledger_entry/stock_ledger_entry.py @@ -119,11 +119,12 @@ class DocType(DocListController): def scrub_posting_time(self): if not self.doc.posting_time or self.doc.posting_time == '00:0': self.doc.posting_time = '00:00' - - def on_doctype_update(self): - if not webnotes.conn.sql("""show index from `tabStock Ledger Entry` - where Key_name="posting_sort_index" """): - webnotes.conn.commit() - webnotes.conn.sql("""alter table `tabStock Ledger Entry` - add index posting_sort_index(posting_date, posting_time, name)""") - webnotes.conn.begin() \ No newline at end of file + +def on_doctype_update(): + print "on_doctype_update called for SLE" + if not webnotes.conn.sql("""show index from `tabStock Ledger Entry` + where Key_name="posting_sort_index" """): + webnotes.conn.commit() + webnotes.conn.sql("""alter table `tabStock Ledger Entry` + add index posting_sort_index(posting_date, posting_time, name)""") + webnotes.conn.begin() \ No newline at end of file diff --git a/utilities/doctype/rename_tool/rename_tool.py b/utilities/doctype/rename_tool/rename_tool.py index 5accf3c6b7..4da3a28ad9 100644 --- a/utilities/doctype/rename_tool/rename_tool.py +++ b/utilities/doctype/rename_tool/rename_tool.py @@ -13,7 +13,7 @@ def get_doctypes(): return webnotes.conn.sql_list("""select name from tabDocType where ifnull(allow_rename,0)=1 and module!='Core' order by name""") -@webnotes.whitelist(allow_roles=["System Manager"]) +@webnotes.whitelist() def upload(select_doctype=None, rows=None): from webnotes.utils.datautils import read_csv_content_from_uploaded_file from webnotes.modules import scrub @@ -21,6 +21,9 @@ def upload(select_doctype=None, rows=None): if not select_doctype: select_doctype = webnotes.form_dict.select_doctype + + if not webnotes.has_permission(select_doctype, "write"): + raise webnotes.PermissionError if not rows: rows = read_csv_content_from_uploaded_file() From cba2913ddd698c3058f3b985d698f18a4185fec7 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 5 Jul 2013 12:58:30 +0530 Subject: [PATCH 4/6] [stock ledger entry] [minor] removed print --- stock/doctype/stock_ledger_entry/stock_ledger_entry.py | 1 - 1 file changed, 1 deletion(-) diff --git a/stock/doctype/stock_ledger_entry/stock_ledger_entry.py b/stock/doctype/stock_ledger_entry/stock_ledger_entry.py index c216c42631..664ead21d9 100644 --- a/stock/doctype/stock_ledger_entry/stock_ledger_entry.py +++ b/stock/doctype/stock_ledger_entry/stock_ledger_entry.py @@ -121,7 +121,6 @@ class DocType(DocListController): self.doc.posting_time = '00:00' def on_doctype_update(): - print "on_doctype_update called for SLE" if not webnotes.conn.sql("""show index from `tabStock Ledger Entry` where Key_name="posting_sort_index" """): webnotes.conn.commit() From 8226dc089ed680acb2af2dc7fbbeefa74e445fe1 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 5 Jul 2013 14:15:00 +0530 Subject: [PATCH 5/6] [website] [css] changed default button color --- website/css/website.css | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/website/css/website.css b/website/css/website.css index df37821bfe..816b3efd9d 100644 --- a/website/css/website.css +++ b/website/css/website.css @@ -134,4 +134,35 @@ img { .accordion-heading, .accordion-inner { padding-left: 10px; -} \ No newline at end of file +} + +/* buttons */ +.btn-default { + color: #ffffff; + background-color: #a7a9aa; + border-color: #a7a9aa; +} + +.btn-default:hover, +.btn-default:focus, +.btn-default:active, +.btn-default.active { + background-color: #9a9c9d; + border-color: #8d9091; +} + +.btn-default.disabled:hover, +.btn-default[disabled]:hover, +fieldset[disabled] .btn-default:hover, +.btn-default.disabled:focus, +.btn-default[disabled]:focus, +fieldset[disabled] .btn-default:focus, +.btn-default.disabled:active, +.btn-default[disabled]:active, +fieldset[disabled] .btn-default:active, +.btn-default.disabled.active, +.btn-default[disabled].active, +fieldset[disabled] .btn-default.active { + background-color: #a7a9aa; + border-color: #a7a9aa; +} From 3a3c2710d123a3be11db54ac1c0074cb4e6cb6b5 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 5 Jul 2013 15:13:31 +0530 Subject: [PATCH 6/6] [icon] added in doctype --- accounts/doctype/account/account.txt | 3 +- .../accounts_settings/accounts_settings.txt | 3 +- .../bank_reconciliation.txt | 3 +- .../budget_distribution.txt | 3 +- accounts/doctype/c_form/c_form.txt | 3 +- accounts/doctype/cost_center/cost_center.txt | 3 +- accounts/doctype/fiscal_year/fiscal_year.txt | 3 +- accounts/doctype/gl_entry/gl_entry.txt | 3 +- .../journal_voucher/journal_voucher.txt | 3 +- .../mode_of_payment/mode_of_payment.txt | 3 +- .../payment_to_invoice_matching_tool.txt | 3 +- .../period_closing_voucher.txt | 3 +- accounts/doctype/pos_setting/pos_setting.txt | 3 +- .../purchase_invoice/purchase_invoice.txt | 3 +- .../purchase_taxes_and_charges_master.txt | 3 +- .../doctype/sales_invoice/sales_invoice.txt | 3 +- .../sales_taxes_and_charges_master.txt | 20 +++--- .../doctype/shipping_rule/shipping_rule.txt | 3 +- .../buying_settings/buying_settings.txt | 3 +- .../doctype/purchase_order/purchase_order.txt | 37 +---------- .../quality_inspection/quality_inspection.txt | 3 +- buying/doctype/supplier/supplier.txt | 3 +- .../supplier_quotation/supplier_quotation.txt | 19 +----- home/doctype/feed/feed.txt | 8 +-- hr/doctype/appraisal/appraisal.txt | 3 +- .../appraisal_template/appraisal_template.txt | 61 ++++++++++--------- hr/doctype/attendance/attendance.txt | 3 +- hr/doctype/branch/branch.txt | 3 +- hr/doctype/deduction_type/deduction_type.txt | 3 +- hr/doctype/department/department.txt | 3 +- hr/doctype/designation/designation.txt | 3 +- hr/doctype/earning_type/earning_type.txt | 3 +- hr/doctype/employee/employee.txt | 3 +- .../employment_type/employment_type.txt | 3 +- hr/doctype/expense_claim/expense_claim.txt | 3 +- .../expense_claim_type/expense_claim_type.txt | 23 +++---- hr/doctype/grade/grade.txt | 3 +- hr/doctype/holiday_list/holiday_list.txt | 3 +- hr/doctype/job_applicant/job_applicant.txt | 3 +- hr/doctype/job_opening/job_opening.txt | 41 +++++++------ .../leave_allocation/leave_allocation.txt | 3 +- .../leave_application/leave_application.txt | 6 +- .../leave_block_list/leave_block_list.txt | 3 +- .../leave_control_panel.txt | 3 +- hr/doctype/leave_type/leave_type.txt | 3 +- hr/doctype/salary_manager/salary_manager.txt | 42 ++++++------- hr/doctype/salary_slip/salary_slip.txt | 3 +- .../salary_structure/salary_structure.txt | 3 +- .../upload_attendance/upload_attendance.txt | 3 +- manufacturing/doctype/bom/bom.txt | 3 +- .../bom_replace_tool/bom_replace_tool.txt | 3 +- .../production_order/production_order.txt | 3 +- .../production_planning_tool.txt | 3 +- .../doctype/workstation/workstation.txt | 3 +- patches/patch_list.py | 2 +- .../doctype/activity_type/activity_type.txt | 3 +- projects/doctype/project/project.txt | 3 +- projects/doctype/task/task.txt | 3 +- projects/doctype/time_log/time_log.txt | 3 +- .../doctype/time_log_batch/time_log_batch.txt | 3 +- selling/doctype/campaign/campaign.txt | 3 +- selling/doctype/customer/customer.txt | 3 +- .../doctype/industry_type/industry_type.txt | 13 ++-- .../installation_note/installation_note.txt | 3 +- selling/doctype/lead/lead.txt | 3 +- selling/doctype/opportunity/opportunity.txt | 3 +- selling/doctype/quotation/quotation.txt | 3 +- selling/doctype/sales_bom/sales_bom.txt | 7 +-- selling/doctype/sales_order/sales_order.txt | 3 +- .../selling_settings/selling_settings.txt | 3 +- selling/doctype/sms_center/sms_center.txt | 3 +- .../authorization_rule/authorization_rule.txt | 3 +- .../doctype/backup_manager/backup_manager.txt | 3 +- setup/doctype/brand/brand.txt | 3 +- setup/doctype/company/company.txt | 3 +- setup/doctype/country/country.txt | 3 +- setup/doctype/currency/currency.txt | 3 +- .../currency_exchange/currency_exchange.txt | 3 +- .../doctype/customer_group/customer_group.txt | 3 +- setup/doctype/email_digest/email_digest.txt | 3 +- .../doctype/email_settings/email_settings.txt | 3 +- .../doctype/features_setup/features_setup.txt | 3 +- .../global_defaults/global_defaults.txt | 3 +- setup/doctype/item_group/item_group.txt | 3 +- .../jobs_email_settings.txt | 59 +++++++++--------- setup/doctype/naming_series/naming_series.txt | 3 +- setup/doctype/price_list/price_list.txt | 10 ++- setup/doctype/print_heading/print_heading.txt | 3 +- .../quotation_lost_reason.txt | 3 +- .../sales_email_settings.txt | 59 +++++++++--------- setup/doctype/sales_partner/sales_partner.txt | 3 +- setup/doctype/sales_person/sales_person.txt | 3 +- setup/doctype/sms_settings/sms_settings.txt | 3 +- setup/doctype/supplier_type/supplier_type.txt | 3 +- .../terms_and_conditions.txt | 3 +- setup/doctype/territory/territory.txt | 3 +- setup/doctype/uom/uom.txt | 3 +- .../doctype/warehouse_type/warehouse_type.txt | 3 +- stock/doctype/batch/batch.txt | 3 +- stock/doctype/delivery_note/delivery_note.txt | 3 +- stock/doctype/item/item.txt | 3 +- .../landed_cost_wizard/landed_cost_wizard.txt | 3 +- .../material_request/material_request.txt | 3 +- stock/doctype/packing_slip/packing_slip.txt | 3 +- .../purchase_receipt/purchase_receipt.txt | 3 +- stock/doctype/serial_no/serial_no.txt | 3 +- stock/doctype/stock_entry/stock_entry.txt | 3 +- .../stock_ledger_entry/stock_ledger_entry.txt | 3 +- .../stock_reconciliation.txt | 3 +- .../doctype/stock_settings/stock_settings.txt | 3 +- .../stock_uom_replace_utility.txt | 3 +- stock/doctype/warehouse/warehouse.txt | 3 +- .../doctype/customer_issue/customer_issue.txt | 3 +- .../maintenance_schedule.txt | 3 +- .../maintenance_visit/maintenance_visit.txt | 3 +- support/doctype/newsletter/newsletter.txt | 3 +- .../doctype/support_ticket/support_ticket.txt | 3 +- utilities/doctype/address/address.txt | 3 +- utilities/doctype/contact/contact.txt | 3 +- utilities/doctype/note/note.txt | 3 +- utilities/doctype/rename_tool/rename_tool.txt | 3 +- utilities/doctype/sms_control/sms_control.txt | 3 +- utilities/doctype/sms_log/sms_log.txt | 14 ++--- .../about_us_settings/about_us_settings.txt | 3 +- .../doctype/blog_category/blog_category.txt | 3 +- website/doctype/blog_post/blog_post.txt | 3 +- .../doctype/blog_settings/blog_settings.txt | 3 +- website/doctype/blogger/blogger.txt | 3 +- .../contact_us_settings.txt | 3 +- .../shopping_cart_settings.txt | 3 +- .../doctype/style_settings/style_settings.txt | 3 +- website/doctype/web_page/web_page.txt | 4 +- .../doctype/website_script/website_script.txt | 41 +++++++------ .../website_settings/website_settings.txt | 3 +- .../website_slideshow/website_slideshow.txt | 3 +- 135 files changed, 441 insertions(+), 376 deletions(-) diff --git a/accounts/doctype/account/account.txt b/accounts/doctype/account/account.txt index e515b34f3f..7a6ebf8dac 100644 --- a/accounts/doctype/account/account.txt +++ b/accounts/doctype/account/account.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-30 12:49:46", "docstatus": 0, - "modified": "2013-02-05 15:38:32", + "modified": "2013-07-05 14:23:30", "modified_by": "Administrator", "owner": "Administrator" }, @@ -12,6 +12,7 @@ "description": "Heads (or groups) against which Accounting Entries are made and balances are maintained.", "doctype": "DocType", "document_type": "Master", + "icon": "icon-money", "in_create": 1, "module": "Accounts", "name": "__common__", diff --git a/accounts/doctype/accounts_settings/accounts_settings.txt b/accounts/doctype/accounts_settings/accounts_settings.txt index d10f63946a..b8be161427 100644 --- a/accounts/doctype/accounts_settings/accounts_settings.txt +++ b/accounts/doctype/accounts_settings/accounts_settings.txt @@ -2,13 +2,14 @@ { "creation": "2013-06-24 15:49:57", "docstatus": 0, - "modified": "2013-06-24 16:12:29", + "modified": "2013-07-05 14:23:40", "modified_by": "Administrator", "owner": "Administrator" }, { "description": "Settings for Accounts", "doctype": "DocType", + "icon": "icon-cog", "issingle": 1, "module": "Accounts", "name": "__common__" diff --git a/accounts/doctype/bank_reconciliation/bank_reconciliation.txt b/accounts/doctype/bank_reconciliation/bank_reconciliation.txt index 194cc4257f..3cd385b493 100644 --- a/accounts/doctype/bank_reconciliation/bank_reconciliation.txt +++ b/accounts/doctype/bank_reconciliation/bank_reconciliation.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:05", "docstatus": 0, - "modified": "2013-01-29 16:27:50", + "modified": "2013-07-05 14:26:22", "modified_by": "Administrator", "owner": "Administrator" }, @@ -13,6 +13,7 @@ "doctype": "DocType", "hide_heading": 1, "hide_toolbar": 1, + "icon": "icon-check", "issingle": 1, "module": "Accounts", "name": "__common__", diff --git a/accounts/doctype/budget_distribution/budget_distribution.txt b/accounts/doctype/budget_distribution/budget_distribution.txt index d2b9cbe0cd..70ef717f92 100644 --- a/accounts/doctype/budget_distribution/budget_distribution.txt +++ b/accounts/doctype/budget_distribution/budget_distribution.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:05", "docstatus": 0, - "modified": "2013-01-22 14:55:58", + "modified": "2013-07-05 14:29:23", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "autoname": "field:distribution_id", "description": "**Budget Distribution** helps you distribute your budget across months if you have seasonality in your business.\n\nTo distribute a budget using this distribution, set this **Budget Distribution** in the **Cost Center**", "doctype": "DocType", + "icon": "icon-bar-chart", "module": "Accounts", "name": "__common__", "name_case": "Title Case" diff --git a/accounts/doctype/c_form/c_form.txt b/accounts/doctype/c_form/c_form.txt index 79556abaa6..248f413c0e 100644 --- a/accounts/doctype/c_form/c_form.txt +++ b/accounts/doctype/c_form/c_form.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-07 11:55:06", "docstatus": 0, - "modified": "2013-06-11 12:10:33", + "modified": "2013-07-05 14:29:48", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "allow_attach": 1, "autoname": "naming_series:", "doctype": "DocType", + "icon": "icon-file-text", "is_submittable": 1, "max_attachments": 3, "module": "Accounts", diff --git a/accounts/doctype/cost_center/cost_center.txt b/accounts/doctype/cost_center/cost_center.txt index 5fbc43b940..7f5fe24c7b 100644 --- a/accounts/doctype/cost_center/cost_center.txt +++ b/accounts/doctype/cost_center/cost_center.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-23 19:57:17", "docstatus": 0, - "modified": "2013-01-25 15:04:03", + "modified": "2013-07-05 14:33:05", "modified_by": "Administrator", "owner": "Administrator" }, @@ -13,6 +13,7 @@ "description": "Track separate Income and Expense for product verticals or divisions.", "doctype": "DocType", "document_type": "Master", + "icon": "icon-money", "in_create": 1, "module": "Accounts", "name": "__common__", diff --git a/accounts/doctype/fiscal_year/fiscal_year.txt b/accounts/doctype/fiscal_year/fiscal_year.txt index 935b76f16f..511adf5571 100644 --- a/accounts/doctype/fiscal_year/fiscal_year.txt +++ b/accounts/doctype/fiscal_year/fiscal_year.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-22 16:50:25", "docstatus": 0, - "modified": "2013-03-13 12:29:40", + "modified": "2013-07-05 14:38:22", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "description": "**Fiscal Year** represents a Financial Year. All accounting entries and other major transactions are tracked against **Fiscal Year**.", "doctype": "DocType", "document_type": "Master", + "icon": "icon-calendar", "module": "Accounts", "name": "__common__" }, diff --git a/accounts/doctype/gl_entry/gl_entry.txt b/accounts/doctype/gl_entry/gl_entry.txt index 84d9eee5a9..2f20a350a4 100644 --- a/accounts/doctype/gl_entry/gl_entry.txt +++ b/accounts/doctype/gl_entry/gl_entry.txt @@ -2,13 +2,14 @@ { "creation": "2013-01-10 16:34:06", "docstatus": 0, - "modified": "2013-01-29 16:27:50", + "modified": "2013-07-05 14:39:07", "modified_by": "Administrator", "owner": "Administrator" }, { "autoname": "GL.#######", "doctype": "DocType", + "icon": "icon-list", "in_create": 1, "module": "Accounts", "name": "__common__", diff --git a/accounts/doctype/journal_voucher/journal_voucher.txt b/accounts/doctype/journal_voucher/journal_voucher.txt index 183353555c..355242c5ac 100644 --- a/accounts/doctype/journal_voucher/journal_voucher.txt +++ b/accounts/doctype/journal_voucher/journal_voucher.txt @@ -2,13 +2,14 @@ { "creation": "2013-03-25 10:53:52", "docstatus": 0, - "modified": "2013-07-05 10:27:45", + "modified": "2013-07-05 14:43:51", "modified_by": "Administrator", "owner": "Administrator" }, { "autoname": "naming_series:", "doctype": "DocType", + "icon": "icon-file-text", "is_submittable": 1, "module": "Accounts", "name": "__common__", diff --git a/accounts/doctype/mode_of_payment/mode_of_payment.txt b/accounts/doctype/mode_of_payment/mode_of_payment.txt index 0841af0dae..5d004e3422 100644 --- a/accounts/doctype/mode_of_payment/mode_of_payment.txt +++ b/accounts/doctype/mode_of_payment/mode_of_payment.txt @@ -2,7 +2,7 @@ { "creation": "2012-12-04 17:49:20", "docstatus": 0, - "modified": "2013-04-19 10:59:05", + "modified": "2013-07-05 14:46:28", "modified_by": "Administrator", "owner": "harshada@webnotestech.com" }, @@ -11,6 +11,7 @@ "autoname": "field:mode_of_payment", "doctype": "DocType", "document_type": "Master", + "icon": "icon-credit-card", "module": "Accounts", "name": "__common__" }, diff --git a/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.txt b/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.txt index fc84d36429..235188ebf2 100644 --- a/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.txt +++ b/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-30 12:49:46", "docstatus": 0, - "modified": "2013-02-01 14:05:56", + "modified": "2013-07-05 14:48:10", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "doctype": "DocType", "document_type": "Other", "hide_toolbar": 1, + "icon": "icon-magic", "issingle": 1, "module": "Accounts", "name": "__common__" diff --git a/accounts/doctype/period_closing_voucher/period_closing_voucher.txt b/accounts/doctype/period_closing_voucher/period_closing_voucher.txt index ac4b71db28..77d55dca18 100644 --- a/accounts/doctype/period_closing_voucher/period_closing_voucher.txt +++ b/accounts/doctype/period_closing_voucher/period_closing_voucher.txt @@ -2,13 +2,14 @@ { "creation": "2013-01-10 16:34:07", "docstatus": 0, - "modified": "2013-06-11 16:04:45", + "modified": "2013-07-05 14:50:27", "modified_by": "Administrator", "owner": "jai@webnotestech.com" }, { "autoname": "PCE/.###", "doctype": "DocType", + "icon": "icon-file-text", "is_submittable": 1, "module": "Accounts", "name": "__common__", diff --git a/accounts/doctype/pos_setting/pos_setting.txt b/accounts/doctype/pos_setting/pos_setting.txt index accb29e351..44549737e2 100755 --- a/accounts/doctype/pos_setting/pos_setting.txt +++ b/accounts/doctype/pos_setting/pos_setting.txt @@ -2,13 +2,14 @@ { "creation": "2013-05-24 12:15:51", "docstatus": 0, - "modified": "2013-05-30 12:09:39", + "modified": "2013-07-05 14:50:33", "modified_by": "Administrator", "owner": "Administrator" }, { "autoname": "POS/.####", "doctype": "DocType", + "icon": "icon-cog", "module": "Accounts", "name": "__common__" }, diff --git a/accounts/doctype/purchase_invoice/purchase_invoice.txt b/accounts/doctype/purchase_invoice/purchase_invoice.txt index efe04ef3e6..c50e8f3b7b 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-07-05 10:40:16", + "modified": "2013-07-05 14:51:53", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "allow_attach": 1, "autoname": "naming_series:", "doctype": "DocType", + "icon": "icon-file-text", "is_submittable": 1, "module": "Accounts", "name": "__common__", diff --git a/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt b/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt index 8751a6faea..cd366f6bd6 100644 --- a/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt +++ b/accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:08", "docstatus": 0, - "modified": "2013-01-22 14:57:21", + "modified": "2013-07-05 14:52:17", "modified_by": "Administrator", "owner": "wasim@webnotestech.com" }, @@ -11,6 +11,7 @@ "description": "Standard tax template that can be applied to all Purchase Transactions. This template can contain list of tax heads and also other expense heads like \"Shipping\", \"Insurance\", \"Handling\" etc.\n\n#### Note\n\nThe tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.\n\n#### Description of Columns\n\n1. Calculation Type: \n - This can be on **Net Total** (that is the sum of basic amount).\n - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.\n - **Actual** (as mentioned).\n2. Account Head: The Account ledger under which this tax will be booked\n3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.\n4. Description: Description of the tax (that will be printed in invoices / quotes).\n5. Rate: Tax rate.\n6. Amount: Tax amount.\n7. Total: Cumulative total to this point.\n8. Enter Row: If based on \"Previous Row Total\" you can select the row number which will be taken as a base for this calculation (default is the previous row).\n9. Consider Tax or Charge for: In this section you can specify if the tax / charge is only for valuation (not a part of total) or only for total (does not add value to the item) or for both.\n10. Add or Deduct: Whether you want to add or deduct the tax.", "doctype": "DocType", "document_type": "Master", + "icon": "icon-money", "module": "Accounts", "name": "__common__" }, diff --git a/accounts/doctype/sales_invoice/sales_invoice.txt b/accounts/doctype/sales_invoice/sales_invoice.txt index 41191ff911..7dc6891793 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-07-05 10:37:41", + "modified": "2013-07-05 14:54:19", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "autoname": "naming_series:", "doctype": "DocType", "document_type": "Transaction", + "icon": "icon-file-text", "is_submittable": 1, "module": "Accounts", "name": "__common__", diff --git a/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.txt b/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.txt index 9aa7053661..0ffc27d091 100644 --- a/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.txt +++ b/accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:09", "docstatus": 0, - "modified": "2013-06-25 12:06:45", + "modified": "2013-07-05 14:54:37", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "description": "Standard tax template that can be applied to all Sales Transactions. This template can contain list of tax heads and also other expense / income heads like \"Shipping\", \"Insurance\", \"Handling\" etc.\n\n#### Note\n\nThe tax rate you define here will be the standard tax rate for all **Items**. If there are **Items** that have different rates, they must be added in the **Item Tax** table in the **Item** master.\n\n#### Description of Columns\n\n1. Calculation Type: \n - This can be on **Net Total** (that is the sum of basic amount).\n - **On Previous Row Total / Amount** (for cumulative taxes or charges). If you select this option, the tax will be applied as a percentage of the previous row (in the tax table) amount or total.\n - **Actual** (as mentioned).\n2. Account Head: The Account ledger under which this tax will be booked\n3. Cost Center: If the tax / charge is an income (like shipping) or expense it needs to be booked against a Cost Center.\n4. Description: Description of the tax (that will be printed in invoices / quotes).\n5. Rate: Tax rate.\n6. Amount: Tax amount.\n7. Total: Cumulative total to this point.\n8. Enter Row: If based on \"Previous Row Total\" you can select the row number which will be taken as a base for this calculation (default is the previous row).\n9. Is this Tax included in Basic Rate?: If you check this, it means that this tax will not be shown below the item table, but will be included in the Basic Rate in your main item table. This is useful where you want give a flat price (inclusive of all taxes) price to customers.", "doctype": "DocType", "document_type": "Master", + "icon": "icon-money", "module": "Accounts", "name": "__common__" }, @@ -30,7 +31,8 @@ "parenttype": "DocType", "permlevel": 0, "read": 1, - "report": 1 + "report": 1, + "submit": 0 }, { "doctype": "DocType", @@ -100,20 +102,21 @@ "create": 0, "doctype": "DocPerm", "role": "Sales User", - "submit": 0, "write": 0 }, - { - "doctype": "DocPerm", - "role": "Accounts User" - }, { "amend": 0, "cancel": 1, "create": 1, "doctype": "DocPerm", "role": "Accounts Manager", - "submit": 0, + "write": 1 + }, + { + "cancel": 1, + "create": 1, + "doctype": "DocPerm", + "role": "System Manager", "write": 1 }, { @@ -122,7 +125,6 @@ "create": 1, "doctype": "DocPerm", "role": "Sales Master Manager", - "submit": 0, "write": 1 } ] \ No newline at end of file diff --git a/accounts/doctype/shipping_rule/shipping_rule.txt b/accounts/doctype/shipping_rule/shipping_rule.txt index 99886cac29..43589b49a3 100644 --- a/accounts/doctype/shipping_rule/shipping_rule.txt +++ b/accounts/doctype/shipping_rule/shipping_rule.txt @@ -2,7 +2,7 @@ { "creation": "2013-06-25 11:48:03", "docstatus": 0, - "modified": "2013-07-04 16:28:42", + "modified": "2013-07-05 14:55:00", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "autoname": "Prompt", "description": "Specify conditions to calculate shipping amount", "doctype": "DocType", + "icon": "icon-truck", "module": "Accounts", "name": "__common__" }, diff --git a/buying/doctype/buying_settings/buying_settings.txt b/buying/doctype/buying_settings/buying_settings.txt index eb0da1d2af..eec7260405 100644 --- a/buying/doctype/buying_settings/buying_settings.txt +++ b/buying/doctype/buying_settings/buying_settings.txt @@ -2,7 +2,7 @@ { "creation": "2013-06-25 11:04:03", "docstatus": 0, - "modified": "2013-06-25 11:43:08", + "modified": "2013-07-05 14:29:41", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "description": "Settings for Buying Module", "doctype": "DocType", "document_type": "Other", + "icon": "icon-cog", "issingle": 1, "module": "Buying", "name": "__common__" diff --git a/buying/doctype/purchase_order/purchase_order.txt b/buying/doctype/purchase_order/purchase_order.txt index 6fd2161399..90ab298573 100644 --- a/buying/doctype/purchase_order/purchase_order.txt +++ b/buying/doctype/purchase_order/purchase_order.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-21 16:16:39", "docstatus": 0, - "modified": "2013-07-04 18:10:21", + "modified": "2013-07-05 14:51:59", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "autoname": "naming_series:", "doctype": "DocType", "document_type": "Transaction", + "icon": "icon-file-text", "is_submittable": 1, "module": "Buying", "name": "__common__", @@ -31,6 +32,7 @@ "parent": "Purchase Order", "parentfield": "permissions", "parenttype": "DocType", + "permlevel": 0, "read": 1, "report": 1 }, @@ -787,37 +789,15 @@ "cancel": 0, "create": 0, "doctype": "DocPerm", - "permlevel": 1, "role": "Material User", "submit": 0, "write": 0 }, - { - "amend": 0, - "cancel": 0, - "create": 0, - "doctype": "DocPerm", - "permlevel": 0, - "role": "Material User", - "submit": 0, - "write": 0 - }, - { - "amend": 0, - "cancel": 0, - "create": 0, - "doctype": "DocPerm", - "permlevel": 1, - "role": "Purchase Manager", - "submit": 0, - "write": 0 - }, { "amend": 1, "cancel": 1, "create": 1, "doctype": "DocPerm", - "permlevel": 0, "role": "Purchase Manager", "submit": 1, "write": 1 @@ -827,24 +807,13 @@ "cancel": 1, "create": 1, "doctype": "DocPerm", - "permlevel": 0, "role": "Purchase User", "submit": 1, "write": 1 }, - { - "amend": 0, - "cancel": 0, - "create": 0, - "doctype": "DocPerm", - "permlevel": 1, - "role": "All", - "submit": 0 - }, { "doctype": "DocPerm", "match": "supplier", - "permlevel": 0, "role": "Supplier" } ] \ No newline at end of file diff --git a/buying/doctype/quality_inspection/quality_inspection.txt b/buying/doctype/quality_inspection/quality_inspection.txt index 1017753440..66baddf19d 100644 --- a/buying/doctype/quality_inspection/quality_inspection.txt +++ b/buying/doctype/quality_inspection/quality_inspection.txt @@ -2,13 +2,14 @@ { "creation": "2013-04-30 13:13:03", "docstatus": 0, - "modified": "2013-06-11 16:05:29", + "modified": "2013-07-05 14:52:20", "modified_by": "Administrator", "owner": "Administrator" }, { "autoname": "naming_series:", "doctype": "DocType", + "icon": "icon-search", "is_submittable": 1, "module": "Buying", "name": "__common__", diff --git a/buying/doctype/supplier/supplier.txt b/buying/doctype/supplier/supplier.txt index 3d71e1d1db..ebb650514c 100644 --- a/buying/doctype/supplier/supplier.txt +++ b/buying/doctype/supplier/supplier.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:11", "docstatus": 0, - "modified": "2013-07-04 10:13:19", + "modified": "2013-07-05 14:57:04", "modified_by": "Administrator", "owner": "Administrator" }, @@ -12,6 +12,7 @@ "description": "Supplier of Goods or Services.", "doctype": "DocType", "document_type": "Master", + "icon": "icon-user", "module": "Buying", "name": "__common__", "search_fields": "supplier_name,supplier_type" diff --git a/buying/doctype/supplier_quotation/supplier_quotation.txt b/buying/doctype/supplier_quotation/supplier_quotation.txt index 5f2e95ee8c..95fe364d01 100644 --- a/buying/doctype/supplier_quotation/supplier_quotation.txt +++ b/buying/doctype/supplier_quotation/supplier_quotation.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-21 16:16:45", "docstatus": 0, - "modified": "2013-07-04 18:47:51", + "modified": "2013-07-05 14:57:12", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "autoname": "naming_series:", "doctype": "DocType", "document_type": "Transaction", + "icon": "icon-shopping-cart", "is_submittable": 1, "module": "Buying", "name": "__common__", @@ -31,6 +32,7 @@ "parent": "Supplier Quotation", "parentfield": "permissions", "parenttype": "DocType", + "permlevel": 0, "read": 1, "report": 1 }, @@ -642,7 +644,6 @@ "cancel": 1, "create": 1, "doctype": "DocPerm", - "permlevel": 0, "role": "Manufacturing Manager", "submit": 1, "write": 1 @@ -652,7 +653,6 @@ "cancel": 1, "create": 1, "doctype": "DocPerm", - "permlevel": 0, "role": "Purchase Manager", "submit": 1, "write": 1 @@ -662,7 +662,6 @@ "cancel": 0, "create": 1, "doctype": "DocPerm", - "permlevel": 0, "role": "Purchase User", "submit": 0, "write": 1 @@ -672,7 +671,6 @@ "cancel": 0, "create": 0, "doctype": "DocPerm", - "permlevel": 0, "role": "Material User", "submit": 0, "write": 0 @@ -682,19 +680,8 @@ "cancel": 0, "create": 0, "doctype": "DocPerm", - "permlevel": 0, "role": "Supplier", "submit": 0, "write": 0 - }, - { - "amend": 0, - "cancel": 0, - "create": 0, - "doctype": "DocPerm", - "permlevel": 1, - "role": "All", - "submit": 0, - "write": 0 } ] \ No newline at end of file diff --git a/home/doctype/feed/feed.txt b/home/doctype/feed/feed.txt index 5767181436..c80e24c857 100644 --- a/home/doctype/feed/feed.txt +++ b/home/doctype/feed/feed.txt @@ -2,18 +2,16 @@ { "creation": "2012-07-03 13:29:42", "docstatus": 0, - "modified": "2012-10-15 15:23:02", + "modified": "2013-07-05 14:38:06", "modified_by": "Administrator", "owner": "Administrator" }, { "autoname": "_FEED.#####", "doctype": "DocType", + "icon": "icon-rss", "module": "Home", - "name": "__common__", - "section_style": "Simple", - "show_in_menu": 0, - "version": 1 + "name": "__common__" }, { "doctype": "DocField", diff --git a/hr/doctype/appraisal/appraisal.txt b/hr/doctype/appraisal/appraisal.txt index 436434b18a..8aaa7e109c 100644 --- a/hr/doctype/appraisal/appraisal.txt +++ b/hr/doctype/appraisal/appraisal.txt @@ -2,13 +2,14 @@ { "creation": "2013-01-10 16:34:12", "docstatus": 0, - "modified": "2013-06-11 16:06:06", + "modified": "2013-07-05 14:24:59", "modified_by": "Administrator", "owner": "ashwini@webnotestech.com" }, { "autoname": "APRSL.#####", "doctype": "DocType", + "icon": "icon-thumbs-up", "is_submittable": 1, "module": "HR", "name": "__common__", diff --git a/hr/doctype/appraisal_template/appraisal_template.txt b/hr/doctype/appraisal_template/appraisal_template.txt index c208ea601c..63c14f0889 100644 --- a/hr/doctype/appraisal_template/appraisal_template.txt +++ b/hr/doctype/appraisal_template/appraisal_template.txt @@ -1,69 +1,70 @@ [ { - "owner": "ashwini@webnotestech.com", - "docstatus": 0, "creation": "2012-07-03 13:30:39", + "docstatus": 0, + "modified": "2013-07-05 14:25:14", "modified_by": "Administrator", - "modified": "2013-01-07 17:16:25" + "owner": "ashwini@webnotestech.com" }, { - "name": "__common__", "autoname": "field:kra_title", - "module": "HR", "doctype": "DocType", - "document_type": "Master" + "document_type": "Master", + "icon": "icon-file-text", + "module": "HR", + "name": "__common__" }, { - "name": "__common__", - "parent": "Appraisal Template", "doctype": "DocField", + "name": "__common__", + "parent": "Appraisal Template", + "parentfield": "fields", "parenttype": "DocType", - "permlevel": 0, - "parentfield": "fields" + "permlevel": 0 }, { - "parent": "Appraisal Template", - "read": 1, - "report": 1, - "name": "__common__", "create": 1, "doctype": "DocPerm", - "write": 1, + "name": "__common__", + "parent": "Appraisal Template", + "parentfield": "permissions", "parenttype": "DocType", - "role": "HR User", "permlevel": 0, - "parentfield": "permissions" + "read": 1, + "report": 1, + "role": "HR User", + "write": 1 }, { - "name": "Appraisal Template", - "doctype": "DocType" + "doctype": "DocType", + "name": "Appraisal Template" }, { - "oldfieldtype": "Data", "doctype": "DocField", - "label": "Appraisal Template Title", - "oldfieldname": "kra_title", "fieldname": "kra_title", "fieldtype": "Data", + "label": "Appraisal Template Title", + "oldfieldname": "kra_title", + "oldfieldtype": "Data", "reqd": 1 }, { - "print_width": "300px", - "oldfieldtype": "Small Text", "doctype": "DocField", + "fieldname": "description", + "fieldtype": "Small Text", "label": "Description", "oldfieldname": "description", - "width": "300px", - "fieldname": "description", - "fieldtype": "Small Text" + "oldfieldtype": "Small Text", + "print_width": "300px", + "width": "300px" }, { - "oldfieldtype": "Table", "doctype": "DocField", - "label": "Appraisal Template Goal", - "oldfieldname": "kra_sheet", "fieldname": "kra_sheet", "fieldtype": "Table", + "label": "Appraisal Template Goal", + "oldfieldname": "kra_sheet", + "oldfieldtype": "Table", "options": "Appraisal Template Goal" }, { diff --git a/hr/doctype/attendance/attendance.txt b/hr/doctype/attendance/attendance.txt index 05a1ab1b0b..aa917ed7bd 100644 --- a/hr/doctype/attendance/attendance.txt +++ b/hr/doctype/attendance/attendance.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:13", "docstatus": 0, - "modified": "2013-06-11 16:06:17", + "modified": "2013-07-05 14:25:19", "modified_by": "Administrator", "owner": "ashwini@webnotestech.com" }, @@ -10,6 +10,7 @@ "autoname": "naming_series:", "doctype": "DocType", "document_type": "Master", + "icon": "icon-ok", "is_submittable": 1, "module": "HR", "name": "__common__", diff --git a/hr/doctype/branch/branch.txt b/hr/doctype/branch/branch.txt index ea20a1461f..971c24b81b 100644 --- a/hr/doctype/branch/branch.txt +++ b/hr/doctype/branch/branch.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:13", "docstatus": 0, - "modified": "2013-01-22 17:36:37", + "modified": "2013-07-05 14:28:09", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "autoname": "field:branch", "doctype": "DocType", "document_type": "Master", + "icon": "icon-code-fork", "module": "HR", "name": "__common__" }, diff --git a/hr/doctype/deduction_type/deduction_type.txt b/hr/doctype/deduction_type/deduction_type.txt index f3467936f5..7bd0fead7d 100644 --- a/hr/doctype/deduction_type/deduction_type.txt +++ b/hr/doctype/deduction_type/deduction_type.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-22 16:50:30", "docstatus": 0, - "modified": "2013-05-02 11:22:59", + "modified": "2013-07-05 14:34:46", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "autoname": "field:deduction_name", "doctype": "DocType", "document_type": "Master", + "icon": "icon-flag", "module": "HR", "name": "__common__" }, diff --git a/hr/doctype/department/department.txt b/hr/doctype/department/department.txt index f5a6ff6101..188e52a098 100644 --- a/hr/doctype/department/department.txt +++ b/hr/doctype/department/department.txt @@ -2,7 +2,7 @@ { "creation": "2013-02-05 11:48:26", "docstatus": 0, - "modified": "2013-02-14 17:21:51", + "modified": "2013-07-05 14:35:06", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "autoname": "field:department_name", "doctype": "DocType", "document_type": "Master", + "icon": "icon-sitemap", "module": "HR", "name": "__common__" }, diff --git a/hr/doctype/designation/designation.txt b/hr/doctype/designation/designation.txt index e606a35aac..75110c2123 100644 --- a/hr/doctype/designation/designation.txt +++ b/hr/doctype/designation/designation.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:13", "docstatus": 0, - "modified": "2013-01-29 19:06:00", + "modified": "2013-07-05 14:35:42", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "autoname": "field:designation_name", "doctype": "DocType", "document_type": "Master", + "icon": "icon-bookmark", "module": "HR", "name": "__common__" }, diff --git a/hr/doctype/earning_type/earning_type.txt b/hr/doctype/earning_type/earning_type.txt index d69f48619c..0fa8c42fab 100644 --- a/hr/doctype/earning_type/earning_type.txt +++ b/hr/doctype/earning_type/earning_type.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-24 11:03:32", "docstatus": 0, - "modified": "2013-05-02 11:22:48", + "modified": "2013-07-05 14:36:03", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "autoname": "field:earning_name", "doctype": "DocType", "document_type": "Master", + "icon": "icon-flag", "module": "HR", "name": "__common__" }, diff --git a/hr/doctype/employee/employee.txt b/hr/doctype/employee/employee.txt index b22fcb9959..9d6dfae8fd 100644 --- a/hr/doctype/employee/employee.txt +++ b/hr/doctype/employee/employee.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-07 09:04:18", "docstatus": 0, - "modified": "2013-07-05 11:23:07", + "modified": "2013-07-05 14:36:19", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "autoname": "naming_series:", "doctype": "DocType", "document_type": "Master", + "icon": "icon-user", "module": "HR", "name": "__common__", "search_fields": "employee_name" diff --git a/hr/doctype/employment_type/employment_type.txt b/hr/doctype/employment_type/employment_type.txt index a3e40f0bc7..e4a2f24b80 100644 --- a/hr/doctype/employment_type/employment_type.txt +++ b/hr/doctype/employment_type/employment_type.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:14", "docstatus": 0, - "modified": "2013-01-22 14:46:42", + "modified": "2013-07-05 14:36:27", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "autoname": "field:employee_type_name", "doctype": "DocType", "document_type": "Master", + "icon": "icon-flag", "module": "HR", "name": "__common__" }, diff --git a/hr/doctype/expense_claim/expense_claim.txt b/hr/doctype/expense_claim/expense_claim.txt index 979157299a..2b1882fc5b 100644 --- a/hr/doctype/expense_claim/expense_claim.txt +++ b/hr/doctype/expense_claim/expense_claim.txt @@ -2,13 +2,14 @@ { "creation": "2013-01-10 16:34:14", "docstatus": 0, - "modified": "2013-06-11 16:16:35", + "modified": "2013-07-05 14:36:59", "modified_by": "Administrator", "owner": "harshada@webnotestech.com" }, { "autoname": "EXP.######", "doctype": "DocType", + "icon": "icon-money", "is_submittable": 1, "module": "HR", "name": "__common__", diff --git a/hr/doctype/expense_claim_type/expense_claim_type.txt b/hr/doctype/expense_claim_type/expense_claim_type.txt index 3f59e6695b..4d7035063d 100644 --- a/hr/doctype/expense_claim_type/expense_claim_type.txt +++ b/hr/doctype/expense_claim_type/expense_claim_type.txt @@ -2,7 +2,7 @@ { "creation": "2012-03-27 14:35:55", "docstatus": 0, - "modified": "2012-03-27 14:35:55", + "modified": "2013-07-05 14:37:47", "modified_by": "Administrator", "owner": "harshada@webnotestech.com" }, @@ -10,10 +10,9 @@ "autoname": "field:expense_type", "doctype": "DocType", "document_type": "Master", + "icon": "icon-flag", "module": "HR", - "name": "__common__", - "section_style": "Simple", - "version": 5 + "name": "__common__" }, { "doctype": "DocField", @@ -33,24 +32,13 @@ "permlevel": 0, "read": 1, "report": 1, + "role": "HR Manager", "write": 1 }, { "doctype": "DocType", "name": "Expense Claim Type" }, - { - "doctype": "DocPerm", - "role": "System Manager" - }, - { - "doctype": "DocPerm", - "role": "HR Manager" - }, - { - "doctype": "DocPerm", - "role": "System Manager" - }, { "doctype": "DocField", "fieldname": "expense_type", @@ -70,5 +58,8 @@ "oldfieldname": "description", "oldfieldtype": "Small Text", "width": "300px" + }, + { + "doctype": "DocPerm" } ] \ No newline at end of file diff --git a/hr/doctype/grade/grade.txt b/hr/doctype/grade/grade.txt index 51a041edf0..b674c31153 100644 --- a/hr/doctype/grade/grade.txt +++ b/hr/doctype/grade/grade.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:14", "docstatus": 0, - "modified": "2013-01-22 14:46:59", + "modified": "2013-07-05 14:39:58", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "autoname": "field:grade_name", "doctype": "DocType", "document_type": "Master", + "icon": "icon-star-half-empty", "module": "HR", "name": "__common__" }, diff --git a/hr/doctype/holiday_list/holiday_list.txt b/hr/doctype/holiday_list/holiday_list.txt index fc16aa90c9..5978f1457b 100644 --- a/hr/doctype/holiday_list/holiday_list.txt +++ b/hr/doctype/holiday_list/holiday_list.txt @@ -2,13 +2,14 @@ { "creation": "2013-01-10 16:34:14", "docstatus": 0, - "modified": "2013-01-22 14:47:00", + "modified": "2013-07-05 14:40:02", "modified_by": "Administrator", "owner": "Administrator" }, { "doctype": "DocType", "document_type": "Master", + "icon": "icon-calendar", "module": "HR", "name": "__common__" }, diff --git a/hr/doctype/job_applicant/job_applicant.txt b/hr/doctype/job_applicant/job_applicant.txt index d2a2d77ca7..ebf95f68bb 100644 --- a/hr/doctype/job_applicant/job_applicant.txt +++ b/hr/doctype/job_applicant/job_applicant.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-29 19:25:37", "docstatus": 0, - "modified": "2013-01-29 17:44:52", + "modified": "2013-07-05 14:43:11", "modified_by": "Administrator", "owner": "Administrator" }, @@ -12,6 +12,7 @@ "description": "Applicant for a Job", "doctype": "DocType", "document_type": "Transaction", + "icon": "icon-user", "module": "HR", "name": "__common__" }, diff --git a/hr/doctype/job_opening/job_opening.txt b/hr/doctype/job_opening/job_opening.txt index 5e26f0d1c1..a507547d6e 100644 --- a/hr/doctype/job_opening/job_opening.txt +++ b/hr/doctype/job_opening/job_opening.txt @@ -1,65 +1,66 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2013-01-15 16:13:36", + "docstatus": 0, + "modified": "2013-07-05 14:43:35", "modified_by": "Administrator", - "modified": "2013-01-15 16:43:05" + "owner": "Administrator" }, { "autoname": "field:job_title", "description": "Description of a Job Opening", "doctype": "DocType", - "module": "HR", "document_type": "Transaction", + "icon": "icon-bookmark", + "module": "HR", "name": "__common__" }, { + "doctype": "DocField", "name": "__common__", "parent": "Job Opening", - "doctype": "DocField", + "parentfield": "fields", "parenttype": "DocType", - "permlevel": 0, - "parentfield": "fields" + "permlevel": 0 }, { - "parent": "Job Opening", - "read": 1, "cancel": 1, - "name": "__common__", "create": 1, "doctype": "DocPerm", - "write": 1, + "name": "__common__", + "parent": "Job Opening", + "parentfield": "permissions", "parenttype": "DocType", - "role": "HR User", - "report": 1, "permlevel": 0, - "parentfield": "permissions" + "read": 1, + "report": 1, + "role": "HR User", + "write": 1 }, { - "name": "Job Opening", - "doctype": "DocType" + "doctype": "DocType", + "name": "Job Opening" }, { "doctype": "DocField", - "label": "Job Title", "fieldname": "job_title", "fieldtype": "Data", + "label": "Job Title", "reqd": 1 }, { "doctype": "DocField", - "label": "Status", "fieldname": "status", "fieldtype": "Select", + "label": "Status", "options": "Open\nClosed" }, { "description": "Job profile, qualifications required etc.", "doctype": "DocField", - "label": "Description", "fieldname": "description", - "fieldtype": "Text Editor" + "fieldtype": "Text Editor", + "label": "Description" }, { "doctype": "DocPerm" diff --git a/hr/doctype/leave_allocation/leave_allocation.txt b/hr/doctype/leave_allocation/leave_allocation.txt index cd2fc029e0..a24823a454 100644 --- a/hr/doctype/leave_allocation/leave_allocation.txt +++ b/hr/doctype/leave_allocation/leave_allocation.txt @@ -2,7 +2,7 @@ { "creation": "2013-02-20 19:10:38", "docstatus": 0, - "modified": "2013-06-11 16:16:32", + "modified": "2013-07-05 14:44:19", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "allow_import": 1, "autoname": "LAL/.#####", "doctype": "DocType", + "icon": "icon-ok", "is_submittable": 1, "module": "HR", "name": "__common__", diff --git a/hr/doctype/leave_application/leave_application.txt b/hr/doctype/leave_application/leave_application.txt index 0710a5c656..d5feb57a9e 100644 --- a/hr/doctype/leave_application/leave_application.txt +++ b/hr/doctype/leave_application/leave_application.txt @@ -2,7 +2,7 @@ { "creation": "2013-02-20 11:18:11", "docstatus": 0, - "modified": "2013-02-19 16:30:05", + "modified": "2013-07-05 14:44:37", "modified_by": "Administrator", "owner": "Administrator" }, @@ -12,6 +12,7 @@ "description": "Apply / Approve Leaves", "doctype": "DocType", "document_type": "Transaction", + "icon": "icon-calendar", "is_submittable": 1, "max_attachments": 3, "module": "HR", @@ -240,7 +241,6 @@ "cancel": 0, "create": 0, "doctype": "DocPerm", - "match": "", "permlevel": 1, "role": "All", "submit": 0 @@ -273,7 +273,6 @@ "cancel": 0, "create": 0, "doctype": "DocPerm", - "match": "", "permlevel": 1, "report": 1, "role": "HR User", @@ -285,7 +284,6 @@ "cancel": 0, "create": 0, "doctype": "DocPerm", - "match": "", "permlevel": 1, "report": 1, "role": "Leave Approver", diff --git a/hr/doctype/leave_block_list/leave_block_list.txt b/hr/doctype/leave_block_list/leave_block_list.txt index dec4819d07..770bfeecfa 100644 --- a/hr/doctype/leave_block_list/leave_block_list.txt +++ b/hr/doctype/leave_block_list/leave_block_list.txt @@ -2,7 +2,7 @@ { "creation": "2013-02-18 17:43:12", "docstatus": 0, - "modified": "2013-02-19 18:42:35", + "modified": "2013-07-05 14:44:45", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "description": "Block Holidays on important days.", "doctype": "DocType", "document_type": "Master", + "icon": "icon-calendar", "module": "HR", "name": "__common__" }, diff --git a/hr/doctype/leave_control_panel/leave_control_panel.txt b/hr/doctype/leave_control_panel/leave_control_panel.txt index b9014ad7ed..bee3123399 100644 --- a/hr/doctype/leave_control_panel/leave_control_panel.txt +++ b/hr/doctype/leave_control_panel/leave_control_panel.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:15", "docstatus": 0, - "modified": "2013-01-22 13:38:08", + "modified": "2013-07-05 14:44:50", "modified_by": "Administrator", "owner": "Administrator" }, @@ -13,6 +13,7 @@ "doctype": "DocType", "hide_heading": 0, "hide_toolbar": 0, + "icon": "icon-cog", "issingle": 1, "module": "HR", "name": "__common__", diff --git a/hr/doctype/leave_type/leave_type.txt b/hr/doctype/leave_type/leave_type.txt index 3087caaa1a..29960b252a 100644 --- a/hr/doctype/leave_type/leave_type.txt +++ b/hr/doctype/leave_type/leave_type.txt @@ -2,7 +2,7 @@ { "creation": "2013-02-21 09:55:58", "docstatus": 0, - "modified": "2013-03-05 08:06:43", + "modified": "2013-07-05 14:44:54", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "autoname": "field:leave_type_name", "doctype": "DocType", "document_type": "Master", + "icon": "icon-flag", "module": "HR", "name": "__common__" }, diff --git a/hr/doctype/salary_manager/salary_manager.txt b/hr/doctype/salary_manager/salary_manager.txt index 081b156d80..f25de4ff00 100644 --- a/hr/doctype/salary_manager/salary_manager.txt +++ b/hr/doctype/salary_manager/salary_manager.txt @@ -2,23 +2,20 @@ { "creation": "2012-03-27 14:35:59", "docstatus": 0, - "modified": "2012-03-27 14:35:59", + "modified": "2013-07-05 14:53:30", "modified_by": "Administrator", "owner": "Administrator" }, { - "_last_update": "1314253977", "allow_copy": 1, "allow_email": 1, "allow_print": 1, "doctype": "DocType", "document_type": "Other", + "icon": "icon-cog", "issingle": 1, "module": "HR", - "name": "__common__", - "section_style": "Simple", - "show_in_menu": 1, - "version": 30 + "name": "__common__" }, { "doctype": "DocField", @@ -43,18 +40,6 @@ "doctype": "DocType", "name": "Salary Manager" }, - { - "doctype": "DocPerm", - "role": "System Manager" - }, - { - "doctype": "DocPerm", - "role": "HR User" - }, - { - "doctype": "DocPerm", - "role": "HR Manager" - }, { "doctype": "DocField", "fieldname": "document_description", @@ -154,8 +139,7 @@ "doctype": "DocField", "fieldname": "create_salary_slip", "fieldtype": "Button", - "label": "Create Salary Slip", - "trigger": "Client" + "label": "Create Salary Slip" }, { "doctype": "DocField", @@ -168,8 +152,7 @@ "doctype": "DocField", "fieldname": "submit_salary_slip", "fieldtype": "Button", - "label": "Submit Salary Slip", - "trigger": "Client" + "label": "Submit Salary Slip" }, { "doctype": "DocField", @@ -182,8 +165,7 @@ "doctype": "DocField", "fieldname": "make_bank_voucher", "fieldtype": "Button", - "label": "Make Bank Voucher", - "trigger": "Client" + "label": "Make Bank Voucher" }, { "doctype": "DocField", @@ -195,5 +177,17 @@ "fieldname": "activity_log", "fieldtype": "HTML", "label": "Activity Log" + }, + { + "doctype": "DocPerm", + "role": "System Manager" + }, + { + "doctype": "DocPerm", + "role": "HR User" + }, + { + "doctype": "DocPerm", + "role": "HR Manager" } ] \ No newline at end of file diff --git a/hr/doctype/salary_slip/salary_slip.txt b/hr/doctype/salary_slip/salary_slip.txt index 894ea017c7..871c6b850b 100644 --- a/hr/doctype/salary_slip/salary_slip.txt +++ b/hr/doctype/salary_slip/salary_slip.txt @@ -2,12 +2,13 @@ { "creation": "2013-01-10 16:34:15", "docstatus": 0, - "modified": "2013-06-11 16:16:35", + "modified": "2013-07-05 14:53:44", "modified_by": "Administrator", "owner": "Administrator" }, { "doctype": "DocType", + "icon": "icon-file-text", "is_submittable": 1, "module": "HR", "name": "__common__" diff --git a/hr/doctype/salary_structure/salary_structure.txt b/hr/doctype/salary_structure/salary_structure.txt index 43b36626f6..57d7c0c30f 100644 --- a/hr/doctype/salary_structure/salary_structure.txt +++ b/hr/doctype/salary_structure/salary_structure.txt @@ -2,12 +2,13 @@ { "creation": "2013-03-07 18:50:29", "docstatus": 0, - "modified": "2013-04-22 14:09:04", + "modified": "2013-07-05 14:54:02", "modified_by": "Administrator", "owner": "Administrator" }, { "doctype": "DocType", + "icon": "icon-file-text", "module": "HR", "name": "__common__" }, diff --git a/hr/doctype/upload_attendance/upload_attendance.txt b/hr/doctype/upload_attendance/upload_attendance.txt index c47db65af3..ea861be185 100644 --- a/hr/doctype/upload_attendance/upload_attendance.txt +++ b/hr/doctype/upload_attendance/upload_attendance.txt @@ -2,13 +2,14 @@ { "creation": "2013-01-25 11:34:53", "docstatus": 0, - "modified": "2013-03-05 15:50:03", + "modified": "2013-07-05 15:02:09", "modified_by": "Administrator", "owner": "harshada@webnotestech.com" }, { "allow_attach": 0, "doctype": "DocType", + "icon": "icon-upload-alt", "issingle": 1, "max_attachments": 1, "module": "HR", diff --git a/manufacturing/doctype/bom/bom.txt b/manufacturing/doctype/bom/bom.txt index d539ad0338..e677302a33 100644 --- a/manufacturing/doctype/bom/bom.txt +++ b/manufacturing/doctype/bom/bom.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-22 15:11:38", "docstatus": 0, - "modified": "2013-06-27 11:08:28", + "modified": "2013-07-05 14:27:38", "modified_by": "Administrator", "owner": "Administrator" }, @@ -16,6 +16,7 @@ "document_type": "Master", "hide_heading": 0, "hide_toolbar": 0, + "icon": "icon-sitemap", "in_create": 0, "is_submittable": 1, "issingle": 0, diff --git a/manufacturing/doctype/bom_replace_tool/bom_replace_tool.txt b/manufacturing/doctype/bom_replace_tool/bom_replace_tool.txt index a803608994..cdb65ee24a 100644 --- a/manufacturing/doctype/bom_replace_tool/bom_replace_tool.txt +++ b/manufacturing/doctype/bom_replace_tool/bom_replace_tool.txt @@ -2,7 +2,7 @@ { "creation": "2012-12-06 12:10:10", "docstatus": 0, - "modified": "2013-02-01 12:07:25", + "modified": "2013-07-05 14:27:52", "modified_by": "Administrator", "owner": "Administrator" }, @@ -15,6 +15,7 @@ "document_type": "Other", "hide_heading": 1, "hide_toolbar": 1, + "icon": "icon-magic", "in_create": 1, "issingle": 1, "module": "Manufacturing", diff --git a/manufacturing/doctype/production_order/production_order.txt b/manufacturing/doctype/production_order/production_order.txt index 08123e8e0b..5e665e7ef1 100644 --- a/manufacturing/doctype/production_order/production_order.txt +++ b/manufacturing/doctype/production_order/production_order.txt @@ -2,13 +2,14 @@ { "creation": "2013-01-10 16:34:16", "docstatus": 0, - "modified": "2013-07-03 17:00:29", + "modified": "2013-07-05 14:51:12", "modified_by": "Administrator", "owner": "Administrator" }, { "autoname": "naming_series:", "doctype": "DocType", + "icon": "icon-cogs", "in_create": 0, "is_submittable": 1, "module": "Manufacturing", diff --git a/manufacturing/doctype/production_planning_tool/production_planning_tool.txt b/manufacturing/doctype/production_planning_tool/production_planning_tool.txt index 4b37f9849d..401b172cd0 100644 --- a/manufacturing/doctype/production_planning_tool/production_planning_tool.txt +++ b/manufacturing/doctype/production_planning_tool/production_planning_tool.txt @@ -2,13 +2,14 @@ { "creation": "2013-01-21 12:03:47", "docstatus": 0, - "modified": "2013-02-18 13:43:26", + "modified": "2013-07-05 14:51:19", "modified_by": "Administrator", "owner": "jai@webnotestech.com" }, { "default_print_format": "Standard", "doctype": "DocType", + "icon": "icon-calendar", "in_create": 1, "issingle": 1, "module": "Manufacturing", diff --git a/manufacturing/doctype/workstation/workstation.txt b/manufacturing/doctype/workstation/workstation.txt index 8dcb805b80..038e2c9e45 100644 --- a/manufacturing/doctype/workstation/workstation.txt +++ b/manufacturing/doctype/workstation/workstation.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:17", "docstatus": 0, - "modified": "2013-01-23 16:43:17", + "modified": "2013-07-05 15:04:25", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "autoname": "field:workstation_name", "doctype": "DocType", "document_type": "Master", + "icon": "icon-wrench", "module": "Manufacturing", "name": "__common__" }, diff --git a/patches/patch_list.py b/patches/patch_list.py index daf584786a..bbe51fadeb 100644 --- a/patches/patch_list.py +++ b/patches/patch_list.py @@ -19,7 +19,7 @@ patch_list = [ "execute:webnotes.reload_doc('core', 'doctype', 'docfield')", "execute:webnotes.reload_doc('core', 'doctype', 'docperm') # 2013-04-07", "execute:webnotes.reload_doc('core', 'doctype', 'report')", - "execute:webnotes.reload_doc('core', 'doctype', 'doctype')", + "execute:webnotes.reload_doc('core', 'doctype', 'doctype') # 2013-07-04", "patches.mar_2012.so_rv_mapper_fix", "patches.mar_2012.clean_property_setter", "patches.april_2012.naming_series_patch", diff --git a/projects/doctype/activity_type/activity_type.txt b/projects/doctype/activity_type/activity_type.txt index 98665001b0..94fffe7eb6 100644 --- a/projects/doctype/activity_type/activity_type.txt +++ b/projects/doctype/activity_type/activity_type.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-05 10:14:59", "docstatus": 0, - "modified": "2013-03-28 07:18:24", + "modified": "2013-07-05 14:23:55", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "autoname": "field:activity_type", "doctype": "DocType", "document_type": "Master", + "icon": "icon-flag", "in_dialog": 0, "module": "Projects", "name": "__common__" diff --git a/projects/doctype/project/project.txt b/projects/doctype/project/project.txt index 88dfb97195..91dcfa1681 100644 --- a/projects/doctype/project/project.txt +++ b/projects/doctype/project/project.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-07 11:55:07", "docstatus": 0, - "modified": "2013-06-07 12:38:37", + "modified": "2013-07-05 14:51:41", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "autoname": "field:project_name", "doctype": "DocType", "document_type": "Master", + "icon": "icon-puzzle-piece", "max_attachments": 4, "module": "Projects", "name": "__common__", diff --git a/projects/doctype/task/task.txt b/projects/doctype/task/task.txt index 85d6aaa2ba..d890bd67b9 100644 --- a/projects/doctype/task/task.txt +++ b/projects/doctype/task/task.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-29 19:25:50", "docstatus": 0, - "modified": "2013-01-29 16:27:52", + "modified": "2013-07-05 14:57:57", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "autoname": "TASK.#####", "doctype": "DocType", "document_type": "Master", + "icon": "icon-check", "max_attachments": 5, "module": "Projects", "name": "__common__" diff --git a/projects/doctype/time_log/time_log.txt b/projects/doctype/time_log/time_log.txt index 897d6be7db..ff1c2b46fc 100644 --- a/projects/doctype/time_log/time_log.txt +++ b/projects/doctype/time_log/time_log.txt @@ -2,7 +2,7 @@ { "creation": "2013-04-03 16:38:41", "docstatus": 0, - "modified": "2013-04-03 15:51:32", + "modified": "2013-07-05 14:58:20", "modified_by": "Administrator", "owner": "Administrator" }, @@ -12,6 +12,7 @@ "description": "Log of Activities performed by users against Tasks that can be used for tracking time, billing.", "doctype": "DocType", "document_type": "Master", + "icon": "icon-time", "is_submittable": 1, "module": "Projects", "name": "__common__" diff --git a/projects/doctype/time_log_batch/time_log_batch.txt b/projects/doctype/time_log_batch/time_log_batch.txt index 7fe1827e5b..09a43da2af 100644 --- a/projects/doctype/time_log_batch/time_log_batch.txt +++ b/projects/doctype/time_log_batch/time_log_batch.txt @@ -2,7 +2,7 @@ { "creation": "2013-02-28 17:57:33", "docstatus": 0, - "modified": "2013-03-01 17:54:57", + "modified": "2013-07-05 14:58:23", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "description": "Batch Time Logs for Billing.", "doctype": "DocType", "document_type": "Transaction", + "icon": "icon-time", "is_submittable": 1, "module": "Projects", "name": "__common__" diff --git a/selling/doctype/campaign/campaign.txt b/selling/doctype/campaign/campaign.txt index b9db8a5fe6..7025bf5654 100644 --- a/selling/doctype/campaign/campaign.txt +++ b/selling/doctype/campaign/campaign.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:18", "docstatus": 0, - "modified": "2013-01-22 14:55:58", + "modified": "2013-07-05 14:29:57", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "description": "Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment. ", "doctype": "DocType", "document_type": "Master", + "icon": "icon-bullhorn", "module": "Selling", "name": "__common__" }, diff --git a/selling/doctype/customer/customer.txt b/selling/doctype/customer/customer.txt index 86d40f869a..48c3d15273 100644 --- a/selling/doctype/customer/customer.txt +++ b/selling/doctype/customer/customer.txt @@ -2,7 +2,7 @@ { "creation": "2013-06-11 14:26:44", "docstatus": 0, - "modified": "2013-07-03 10:26:04", + "modified": "2013-07-05 14:34:09", "modified_by": "Administrator", "owner": "Administrator" }, @@ -13,6 +13,7 @@ "description": "Buyer of Goods and Services.", "doctype": "DocType", "document_type": "Master", + "icon": "icon-user", "module": "Selling", "name": "__common__", "search_fields": "customer_name,customer_group,country,territory" diff --git a/selling/doctype/industry_type/industry_type.txt b/selling/doctype/industry_type/industry_type.txt index 329a040e06..3c97b3e682 100644 --- a/selling/doctype/industry_type/industry_type.txt +++ b/selling/doctype/industry_type/industry_type.txt @@ -2,7 +2,7 @@ { "creation": "2012-03-27 14:36:09", "docstatus": 0, - "modified": "2012-03-27 14:36:09", + "modified": "2013-07-05 14:40:42", "modified_by": "Administrator", "owner": "harshada@webnotestech.com" }, @@ -10,10 +10,9 @@ "autoname": "field:industry", "doctype": "DocType", "document_type": "Master", + "icon": "icon-flag", "module": "Selling", - "name": "__common__", - "section_style": "Simple", - "version": 4 + "name": "__common__" }, { "doctype": "DocField", @@ -43,6 +42,9 @@ "doctype": "DocType", "name": "Industry Type" }, + { + "doctype": "DocField" + }, { "create": 1, "doctype": "DocPerm", @@ -58,8 +60,5 @@ "doctype": "DocPerm", "role": "Sales Master Manager", "write": 1 - }, - { - "doctype": "DocField" } ] \ No newline at end of file diff --git a/selling/doctype/installation_note/installation_note.txt b/selling/doctype/installation_note/installation_note.txt index 8032cbe911..9a9986390d 100644 --- a/selling/doctype/installation_note/installation_note.txt +++ b/selling/doctype/installation_note/installation_note.txt @@ -2,13 +2,14 @@ { "creation": "2013-04-30 13:13:06", "docstatus": 0, - "modified": "2013-06-11 16:16:39", + "modified": "2013-07-05 14:40:56", "modified_by": "Administrator", "owner": "Administrator" }, { "autoname": "naming_series:", "doctype": "DocType", + "icon": "icon-wrench", "is_submittable": 1, "module": "Selling", "name": "__common__" diff --git a/selling/doctype/lead/lead.txt b/selling/doctype/lead/lead.txt index 343eb1ee78..28a8ff4f6c 100644 --- a/selling/doctype/lead/lead.txt +++ b/selling/doctype/lead/lead.txt @@ -2,7 +2,7 @@ { "creation": "2013-04-10 11:45:37", "docstatus": 0, - "modified": "2013-07-03 10:24:00", + "modified": "2013-07-05 14:44:00", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "autoname": "naming_series:", "doctype": "DocType", "document_type": "Master", + "icon": "icon-user", "module": "Selling", "name": "__common__", "search_fields": "lead_name,lead_owner,status" diff --git a/selling/doctype/opportunity/opportunity.txt b/selling/doctype/opportunity/opportunity.txt index c4554409b7..318bb49aa7 100644 --- a/selling/doctype/opportunity/opportunity.txt +++ b/selling/doctype/opportunity/opportunity.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-07 18:50:30", "docstatus": 0, - "modified": "2013-07-03 10:29:20", + "modified": "2013-07-05 14:47:52", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "description": "Potential Sales Deal", "doctype": "DocType", "document_type": "Transaction", + "icon": "icon-info-sign", "is_submittable": 1, "module": "Selling", "name": "__common__", diff --git a/selling/doctype/quotation/quotation.txt b/selling/doctype/quotation/quotation.txt index 5aa3aa3c50..fb77282573 100644 --- a/selling/doctype/quotation/quotation.txt +++ b/selling/doctype/quotation/quotation.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-24 19:29:08", "docstatus": 0, - "modified": "2013-07-04 10:56:10", + "modified": "2013-07-05 14:52:37", "modified_by": "Administrator", "owner": "Administrator" }, @@ -13,6 +13,7 @@ "doctype": "DocType", "document_type": "Transaction", "hide_toolbar": 0, + "icon": "icon-shopping-cart", "is_submittable": 1, "max_attachments": 1, "module": "Selling", diff --git a/selling/doctype/sales_bom/sales_bom.txt b/selling/doctype/sales_bom/sales_bom.txt index bf8fa479c2..9a9b6e67cc 100644 --- a/selling/doctype/sales_bom/sales_bom.txt +++ b/selling/doctype/sales_bom/sales_bom.txt @@ -2,7 +2,7 @@ { "creation": "2013-06-20 11:53:21", "docstatus": 0, - "modified": "2013-06-25 16:43:18", + "modified": "2013-07-05 14:54:08", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "description": "Aggregate group of **Items** into another **Item**. This is useful if you are bundling a certain **Items** into a package and you maintain stock of the packed **Items** and not the aggregate **Item**. \n\nThe package **Item** will have \"Is Stock Item\" as \"No\" and \"Is Sales Item\" as \"Yes\".\n\nFor Example: If you are selling Laptops and Backpacks separately and have a special price if the customer buys both, then the Laptop + Backpack will be a new Sales BOM Item.\n\nNote: BOM = Bill of Materials", "doctype": "DocType", "document_type": "Master", + "icon": "icon-sitemap", "is_submittable": 0, "module": "Selling", "name": "__common__" @@ -23,6 +24,7 @@ "permlevel": 0 }, { + "amend": 0, "doctype": "DocPerm", "name": "__common__", "parent": "Sales BOM", @@ -73,7 +75,6 @@ "reqd": 1 }, { - "amend": 1, "cancel": 1, "create": 1, "doctype": "DocPerm", @@ -81,7 +82,6 @@ "write": 1 }, { - "amend": 0, "cancel": 0, "create": 0, "doctype": "DocPerm", @@ -89,7 +89,6 @@ "write": 0 }, { - "amend": 0, "cancel": 1, "create": 1, "doctype": "DocPerm", diff --git a/selling/doctype/sales_order/sales_order.txt b/selling/doctype/sales_order/sales_order.txt index 6ac7565042..8b531245ed 100644 --- a/selling/doctype/sales_order/sales_order.txt +++ b/selling/doctype/sales_order/sales_order.txt @@ -2,7 +2,7 @@ { "creation": "2013-06-18 12:39:59", "docstatus": 0, - "modified": "2013-07-04 10:56:35", + "modified": "2013-07-05 14:54:26", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "autoname": "naming_series:", "doctype": "DocType", "document_type": "Transaction", + "icon": "icon-file-text", "is_submittable": 1, "issingle": 0, "module": "Selling", diff --git a/selling/doctype/selling_settings/selling_settings.txt b/selling/doctype/selling_settings/selling_settings.txt index a08964d82a..35d256ec7b 100644 --- a/selling/doctype/selling_settings/selling_settings.txt +++ b/selling/doctype/selling_settings/selling_settings.txt @@ -2,7 +2,7 @@ { "creation": "2013-06-25 10:25:16", "docstatus": 0, - "modified": "2013-06-25 10:52:35", + "modified": "2013-07-05 14:54:47", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "description": "Settings for Selling Module", "doctype": "DocType", "document_type": "Other", + "icon": "icon-cog", "issingle": 1, "module": "Selling", "name": "__common__" diff --git a/selling/doctype/sms_center/sms_center.txt b/selling/doctype/sms_center/sms_center.txt index e9b8fdd71c..bed9cf4ac0 100644 --- a/selling/doctype/sms_center/sms_center.txt +++ b/selling/doctype/sms_center/sms_center.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:22", "docstatus": 0, - "modified": "2013-01-22 14:57:24", + "modified": "2013-07-05 14:55:36", "modified_by": "Administrator", "owner": "Administrator" }, @@ -14,6 +14,7 @@ "doctype": "DocType", "hide_heading": 0, "hide_toolbar": 0, + "icon": "icon-mobile-phone", "in_create": 0, "issingle": 1, "module": "Selling", diff --git a/setup/doctype/authorization_rule/authorization_rule.txt b/setup/doctype/authorization_rule/authorization_rule.txt index 9814f5268d..2759480742 100644 --- a/setup/doctype/authorization_rule/authorization_rule.txt +++ b/setup/doctype/authorization_rule/authorization_rule.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:22", "docstatus": 0, - "modified": "2013-01-23 16:51:17", + "modified": "2013-07-05 14:25:35", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "autoname": "AR.####", "doctype": "DocType", "document_type": "Master", + "icon": "icon-shield", "module": "Setup", "name": "__common__", "search_fields": "transaction,based_on,system_user,system_role,approving_user,approving_role" diff --git a/setup/doctype/backup_manager/backup_manager.txt b/setup/doctype/backup_manager/backup_manager.txt index 2d6f191e5e..cf4dbcc4f2 100644 --- a/setup/doctype/backup_manager/backup_manager.txt +++ b/setup/doctype/backup_manager/backup_manager.txt @@ -2,7 +2,7 @@ { "creation": "2013-04-30 12:58:38", "docstatus": 0, - "modified": "2013-05-02 11:42:08", + "modified": "2013-07-05 14:26:02", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "description": "System for managing Backups", "doctype": "DocType", "document_type": "System", + "icon": "icon-cloud-upload", "issingle": 1, "module": "Setup", "name": "__common__" diff --git a/setup/doctype/brand/brand.txt b/setup/doctype/brand/brand.txt index cddd918c4e..633e8aa1b4 100644 --- a/setup/doctype/brand/brand.txt +++ b/setup/doctype/brand/brand.txt @@ -2,7 +2,7 @@ { "creation": "2013-02-22 01:27:54", "docstatus": 0, - "modified": "2013-03-28 07:18:30", + "modified": "2013-07-05 14:28:33", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "autoname": "field:brand", "doctype": "DocType", "document_type": "Master", + "icon": "icon-certificate", "in_dialog": 0, "module": "Setup", "name": "__common__" diff --git a/setup/doctype/company/company.txt b/setup/doctype/company/company.txt index c4176d8132..c4def9a788 100644 --- a/setup/doctype/company/company.txt +++ b/setup/doctype/company/company.txt @@ -2,7 +2,7 @@ { "creation": "2013-04-10 08:35:39", "docstatus": 0, - "modified": "2013-04-17 14:07:46", + "modified": "2013-07-05 14:32:14", "modified_by": "Administrator", "owner": "Administrator" }, @@ -12,6 +12,7 @@ "description": "Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.", "doctype": "DocType", "document_type": "Master", + "icon": "icon-building", "module": "Setup", "name": "__common__" }, diff --git a/setup/doctype/country/country.txt b/setup/doctype/country/country.txt index e4bb408b5f..ee54dcf072 100644 --- a/setup/doctype/country/country.txt +++ b/setup/doctype/country/country.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-19 10:23:30", "docstatus": 0, - "modified": "2013-01-21 15:56:50", + "modified": "2013-07-05 14:33:19", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "autoname": "field:country_name", "doctype": "DocType", "document_type": "Master", + "icon": "icon-globe", "in_create": 0, "module": "Setup", "name": "__common__", diff --git a/setup/doctype/currency/currency.txt b/setup/doctype/currency/currency.txt index 9252c5ae3d..2954c9f9e4 100644 --- a/setup/doctype/currency/currency.txt +++ b/setup/doctype/currency/currency.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-28 10:06:02", "docstatus": 0, - "modified": "2013-01-29 14:55:36", + "modified": "2013-07-05 14:33:39", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "autoname": "field:currency_name", "description": "**Currency** Master", "doctype": "DocType", + "icon": "icon-bitcoin", "in_create": 0, "module": "Setup", "name": "__common__", diff --git a/setup/doctype/currency_exchange/currency_exchange.txt b/setup/doctype/currency_exchange/currency_exchange.txt index 94bb28ab47..f90ecc20b4 100644 --- a/setup/doctype/currency_exchange/currency_exchange.txt +++ b/setup/doctype/currency_exchange/currency_exchange.txt @@ -2,7 +2,7 @@ { "creation": "2013-06-20 15:40:29", "docstatus": 0, - "modified": "2013-07-03 17:11:40", + "modified": "2013-07-05 14:33:47", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "description": "Specify Exchange Rate to convert one currency into another", "doctype": "DocType", "document_type": "Master", + "icon": "icon-bitcoin", "module": "Setup", "name": "__common__" }, diff --git a/setup/doctype/customer_group/customer_group.txt b/setup/doctype/customer_group/customer_group.txt index 6b67d595b6..6a1350046e 100644 --- a/setup/doctype/customer_group/customer_group.txt +++ b/setup/doctype/customer_group/customer_group.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:23", "docstatus": 0, - "modified": "2013-01-22 14:55:59", + "modified": "2013-07-05 14:34:20", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "autoname": "field:customer_group_name", "doctype": "DocType", "document_type": "Master", + "icon": "icon-sitemap", "in_create": 1, "module": "Setup", "name": "__common__", diff --git a/setup/doctype/email_digest/email_digest.txt b/setup/doctype/email_digest/email_digest.txt index 7817429ad3..f71d82a0e3 100644 --- a/setup/doctype/email_digest/email_digest.txt +++ b/setup/doctype/email_digest/email_digest.txt @@ -2,7 +2,7 @@ { "creation": "2013-02-21 14:15:31", "docstatus": 0, - "modified": "2013-02-25 13:08:26", + "modified": "2013-07-05 14:36:13", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "description": "Send regular summary reports via Email.", "doctype": "DocType", "document_type": "System", + "icon": "icon-envelope", "module": "Setup", "name": "__common__" }, diff --git a/setup/doctype/email_settings/email_settings.txt b/setup/doctype/email_settings/email_settings.txt index 5547c2e74c..44aacc6dd2 100644 --- a/setup/doctype/email_settings/email_settings.txt +++ b/setup/doctype/email_settings/email_settings.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-25 17:53:21", "docstatus": 0, - "modified": "2013-03-25 18:41:27", + "modified": "2013-07-05 14:36:16", "modified_by": "Administrator", "owner": "Administrator" }, @@ -12,6 +12,7 @@ "allow_print": 1, "description": "Email Settings for Outgoing and Incoming Emails.", "doctype": "DocType", + "icon": "icon-cog", "in_create": 1, "issingle": 1, "module": "Setup", diff --git a/setup/doctype/features_setup/features_setup.txt b/setup/doctype/features_setup/features_setup.txt index 18a01dc913..e1a4c08acf 100644 --- a/setup/doctype/features_setup/features_setup.txt +++ b/setup/doctype/features_setup/features_setup.txt @@ -2,12 +2,13 @@ { "creation": "2012-12-20 12:50:49", "docstatus": 0, - "modified": "2013-02-18 13:44:28", + "modified": "2013-07-05 14:37:59", "modified_by": "Administrator", "owner": "Administrator" }, { "doctype": "DocType", + "icon": "icon-glass", "issingle": 1, "module": "Setup", "name": "__common__", diff --git a/setup/doctype/global_defaults/global_defaults.txt b/setup/doctype/global_defaults/global_defaults.txt index 98a428c311..6fc07b6c57 100644 --- a/setup/doctype/global_defaults/global_defaults.txt +++ b/setup/doctype/global_defaults/global_defaults.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-02 17:53:24", "docstatus": 0, - "modified": "2013-06-25 11:20:40", + "modified": "2013-07-05 14:39:17", "modified_by": "Administrator", "owner": "Administrator" }, @@ -12,6 +12,7 @@ "allow_print": 1, "doctype": "DocType", "hide_toolbar": 0, + "icon": "icon-cog", "in_create": 1, "issingle": 1, "module": "Setup", diff --git a/setup/doctype/item_group/item_group.txt b/setup/doctype/item_group/item_group.txt index 568cf9d03d..a2b04e7d90 100644 --- a/setup/doctype/item_group/item_group.txt +++ b/setup/doctype/item_group/item_group.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-28 10:35:29", "docstatus": 0, - "modified": "2013-04-01 12:06:52", + "modified": "2013-07-05 14:43:08", "modified_by": "Administrator", "owner": "Administrator" }, @@ -13,6 +13,7 @@ "description": "Item Classification", "doctype": "DocType", "document_type": "Master", + "icon": "icon-sitemap", "in_create": 1, "issingle": 0, "max_attachments": 3, diff --git a/setup/doctype/jobs_email_settings/jobs_email_settings.txt b/setup/doctype/jobs_email_settings/jobs_email_settings.txt index 788f51b7e9..769fc27cfe 100644 --- a/setup/doctype/jobs_email_settings/jobs_email_settings.txt +++ b/setup/doctype/jobs_email_settings/jobs_email_settings.txt @@ -1,87 +1,88 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2013-01-15 16:50:01", + "docstatus": 0, + "modified": "2013-07-05 14:43:39", "modified_by": "Administrator", - "modified": "2013-01-15 16:57:08" + "owner": "Administrator" }, { - "issingle": 1, "description": "Email settings for jobs email id \"jobs@example.com\"", "doctype": "DocType", + "icon": "icon-cog", + "issingle": 1, "module": "Setup", "name": "__common__" }, { + "doctype": "DocField", "name": "__common__", "parent": "Jobs Email Settings", - "doctype": "DocField", + "parentfield": "fields", "parenttype": "DocType", - "permlevel": 0, - "parentfield": "fields" + "permlevel": 0 }, { - "parent": "Jobs Email Settings", - "read": 1, - "name": "__common__", "create": 1, "doctype": "DocPerm", - "write": 1, + "name": "__common__", + "parent": "Jobs Email Settings", + "parentfield": "permissions", "parenttype": "DocType", - "role": "System Manager", "permlevel": 0, - "parentfield": "permissions" + "read": 1, + "role": "System Manager", + "write": 1 }, { - "name": "Jobs Email Settings", - "doctype": "DocType" + "doctype": "DocType", + "name": "Jobs Email Settings" }, { "description": "Settings to extract Job Applicants from a mailbox e.g. \"jobs@example.com\"", "doctype": "DocField", - "label": "POP3 Mail Settings", "fieldname": "pop3_mail_settings", - "fieldtype": "Section Break" + "fieldtype": "Section Break", + "label": "POP3 Mail Settings" }, { "description": "Check to activate", "doctype": "DocField", - "label": "Extract Emails", "fieldname": "extract_emails", - "fieldtype": "Check" + "fieldtype": "Check", + "label": "Extract Emails" }, { "description": "Email Id where a job applicant will email e.g. \"jobs@example.com\"", "doctype": "DocField", - "label": "Email Id", "fieldname": "email_id", - "fieldtype": "Data" + "fieldtype": "Data", + "label": "Email Id" }, { "description": "POP3 server e.g. (pop.gmail.com)", "doctype": "DocField", - "label": "Host", "fieldname": "host", - "fieldtype": "Data" + "fieldtype": "Data", + "label": "Host" }, { "doctype": "DocField", - "label": "Use SSL", "fieldname": "use_ssl", - "fieldtype": "Check" + "fieldtype": "Check", + "label": "Use SSL" }, { "doctype": "DocField", - "label": "Username", "fieldname": "username", - "fieldtype": "Data" + "fieldtype": "Data", + "label": "Username" }, { "doctype": "DocField", - "label": "Password", "fieldname": "password", - "fieldtype": "Password" + "fieldtype": "Password", + "label": "Password" }, { "doctype": "DocPerm" diff --git a/setup/doctype/naming_series/naming_series.txt b/setup/doctype/naming_series/naming_series.txt index 0dab9e970d..28d4765cb4 100644 --- a/setup/doctype/naming_series/naming_series.txt +++ b/setup/doctype/naming_series/naming_series.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-25 11:35:08", "docstatus": 0, - "modified": "2013-05-02 15:34:41", + "modified": "2013-07-05 14:46:46", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "doctype": "DocType", "hide_heading": 0, "hide_toolbar": 1, + "icon": "icon-sort-by-order", "issingle": 1, "module": "Setup", "name": "__common__", diff --git a/setup/doctype/price_list/price_list.txt b/setup/doctype/price_list/price_list.txt index 5113a3e080..769e3d0d7f 100644 --- a/setup/doctype/price_list/price_list.txt +++ b/setup/doctype/price_list/price_list.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-25 11:35:09", "docstatus": 0, - "modified": "2013-06-25 12:05:12", + "modified": "2013-07-05 14:50:47", "modified_by": "Administrator", "owner": "Administrator" }, @@ -15,6 +15,7 @@ "description": "Price List Master", "doctype": "DocType", "document_type": "Master", + "icon": "icon-tags", "max_attachments": 1, "module": "Setup", "name": "__common__" @@ -116,6 +117,13 @@ "label": "How to upload", "options": "
Use the Data Import Tool to upload, update Item Prices in bulk:\n
    \n
  1. Go to Data Import Tool.\n
  2. Select \"Item\"\n
  3. Check on \"With Data\"\n
  4. Download \"Item Price\" from Child Tables.\n
  5. Update the prices required and add new rows if required.\n
  6. Check on \"Overwrite\"\n
  7. Upload the modified sheet.\n
\n" }, + { + "cancel": 0, + "create": 0, + "doctype": "DocPerm", + "role": "Sales Manager", + "write": 0 + }, { "cancel": 0, "create": 0, diff --git a/setup/doctype/print_heading/print_heading.txt b/setup/doctype/print_heading/print_heading.txt index 91df2db967..d6cbe95d63 100644 --- a/setup/doctype/print_heading/print_heading.txt +++ b/setup/doctype/print_heading/print_heading.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:24", "docstatus": 0, - "modified": "2013-01-22 14:47:50", + "modified": "2013-07-05 14:50:55", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "autoname": "field:print_heading", "doctype": "DocType", "document_type": "Master", + "icon": "icon-font", "module": "Setup", "name": "__common__", "search_fields": "print_heading" diff --git a/setup/doctype/quotation_lost_reason/quotation_lost_reason.txt b/setup/doctype/quotation_lost_reason/quotation_lost_reason.txt index 4bb8fc7a43..d580410d44 100644 --- a/setup/doctype/quotation_lost_reason/quotation_lost_reason.txt +++ b/setup/doctype/quotation_lost_reason/quotation_lost_reason.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:24", "docstatus": 0, - "modified": "2013-01-22 14:47:58", + "modified": "2013-07-05 14:52:43", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "autoname": "field:order_lost_reason", "doctype": "DocType", "document_type": "Master", + "icon": "icon-flag", "module": "Setup", "name": "__common__" }, diff --git a/setup/doctype/sales_email_settings/sales_email_settings.txt b/setup/doctype/sales_email_settings/sales_email_settings.txt index d8042e970f..17578128fb 100644 --- a/setup/doctype/sales_email_settings/sales_email_settings.txt +++ b/setup/doctype/sales_email_settings/sales_email_settings.txt @@ -1,87 +1,88 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2013-01-16 10:25:26", + "docstatus": 0, + "modified": "2013-07-05 14:54:14", "modified_by": "Administrator", - "modified": "2013-01-16 10:25:26" + "owner": "Administrator" }, { - "issingle": 1, "description": "Email settings to extract Leads from sales email id e.g. \"sales@example.com\"", "doctype": "DocType", + "icon": "icon-cog", + "issingle": 1, "module": "Setup", "name": "__common__" }, { + "doctype": "DocField", "name": "__common__", "parent": "Sales Email Settings", - "doctype": "DocField", + "parentfield": "fields", "parenttype": "DocType", - "permlevel": 0, - "parentfield": "fields" + "permlevel": 0 }, { - "parent": "Sales Email Settings", - "read": 1, - "name": "__common__", "create": 1, "doctype": "DocPerm", - "write": 1, + "name": "__common__", + "parent": "Sales Email Settings", + "parentfield": "permissions", "parenttype": "DocType", - "role": "System Manager", "permlevel": 0, - "parentfield": "permissions" + "read": 1, + "role": "System Manager", + "write": 1 }, { - "name": "Sales Email Settings", - "doctype": "DocType" + "doctype": "DocType", + "name": "Sales Email Settings" }, { "description": "Email settings to extract Leads from sales email id e.g. \"sales@example.com\"", "doctype": "DocField", - "label": "POP3 Mail Settings", "fieldname": "pop3_mail_settings", - "fieldtype": "Section Break" + "fieldtype": "Section Break", + "label": "POP3 Mail Settings" }, { "description": "Check to activate", "doctype": "DocField", - "label": "Extract Emails", "fieldname": "extract_emails", - "fieldtype": "Check" + "fieldtype": "Check", + "label": "Extract Emails" }, { "description": "Email Id where a job applicant will email e.g. \"jobs@example.com\"", "doctype": "DocField", - "label": "Email Id", "fieldname": "email_id", - "fieldtype": "Data" + "fieldtype": "Data", + "label": "Email Id" }, { "description": "POP3 server e.g. (pop.gmail.com)", "doctype": "DocField", - "label": "Host", "fieldname": "host", - "fieldtype": "Data" + "fieldtype": "Data", + "label": "Host" }, { "doctype": "DocField", - "label": "Use SSL", "fieldname": "use_ssl", - "fieldtype": "Check" + "fieldtype": "Check", + "label": "Use SSL" }, { "doctype": "DocField", - "label": "Username", "fieldname": "username", - "fieldtype": "Data" + "fieldtype": "Data", + "label": "Username" }, { "doctype": "DocField", - "label": "Password", "fieldname": "password", - "fieldtype": "Password" + "fieldtype": "Password", + "label": "Password" }, { "doctype": "DocPerm" diff --git a/setup/doctype/sales_partner/sales_partner.txt b/setup/doctype/sales_partner/sales_partner.txt index 6fdeb69422..ab47565744 100644 --- a/setup/doctype/sales_partner/sales_partner.txt +++ b/setup/doctype/sales_partner/sales_partner.txt @@ -2,7 +2,7 @@ { "creation": "2013-04-12 15:34:06", "docstatus": 0, - "modified": "2013-06-13 14:40:04", + "modified": "2013-07-05 14:54:31", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "description": "A third party distributor / dealer / commission agent / affiliate / reseller who sells the companies products for a commission.", "doctype": "DocType", "document_type": "Master", + "icon": "icon-user", "in_create": 0, "module": "Setup", "name": "__common__", diff --git a/setup/doctype/sales_person/sales_person.txt b/setup/doctype/sales_person/sales_person.txt index 8878a657ce..44a246dc3e 100644 --- a/setup/doctype/sales_person/sales_person.txt +++ b/setup/doctype/sales_person/sales_person.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:24", "docstatus": 0, - "modified": "2013-01-22 14:57:23", + "modified": "2013-07-05 14:54:33", "modified_by": "Administrator", "owner": "Administrator" }, @@ -12,6 +12,7 @@ "description": "All Sales Transactions can be tagged against multiple **Sales Persons** so that you can set and monitor targets.", "doctype": "DocType", "document_type": "Master", + "icon": "icon-user", "in_create": 1, "module": "Setup", "name": "__common__", diff --git a/setup/doctype/sms_settings/sms_settings.txt b/setup/doctype/sms_settings/sms_settings.txt index 43a6d7ef1e..5d10209cb2 100755 --- a/setup/doctype/sms_settings/sms_settings.txt +++ b/setup/doctype/sms_settings/sms_settings.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:24", "docstatus": 0, - "modified": "2013-01-22 14:57:24", + "modified": "2013-07-05 14:55:50", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "allow_email": 1, "allow_print": 1, "doctype": "DocType", + "icon": "icon-cog", "in_create": 0, "issingle": 1, "module": "Setup", diff --git a/setup/doctype/supplier_type/supplier_type.txt b/setup/doctype/supplier_type/supplier_type.txt index 007bf9432c..200dc8115e 100644 --- a/setup/doctype/supplier_type/supplier_type.txt +++ b/setup/doctype/supplier_type/supplier_type.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:24", "docstatus": 0, - "modified": "2013-01-22 14:57:25", + "modified": "2013-07-05 14:57:16", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "autoname": "field:supplier_type", "doctype": "DocType", "document_type": "Master", + "icon": "icon-flag", "module": "Setup", "name": "__common__" }, diff --git a/setup/doctype/terms_and_conditions/terms_and_conditions.txt b/setup/doctype/terms_and_conditions/terms_and_conditions.txt index 47a8c4c240..0ddc8f5d5d 100644 --- a/setup/doctype/terms_and_conditions/terms_and_conditions.txt +++ b/setup/doctype/terms_and_conditions/terms_and_conditions.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:24", "docstatus": 0, - "modified": "2013-01-22 17:36:24", + "modified": "2013-07-05 14:58:02", "modified_by": "Administrator", "owner": "Administrator" }, @@ -12,6 +12,7 @@ "description": "Standard Terms and Conditions that can be added to Sales and Purchases.\n\nExamples:\n\n1. Validity of the offer.\n1. Payment Terms (In Advance, On Credit, part advance etc).\n1. What is extra (or payable by the Customer).\n1. Safety / usage warning.\n1. Warranty if any.\n1. Returns Policy.\n1. Terms of shipping, if applicable.\n1. Ways of addressing disputes, indemnity, liability, etc.\n1. Address and Contact of your Company.", "doctype": "DocType", "document_type": "Master", + "icon": "icon-legal", "module": "Setup", "name": "__common__" }, diff --git a/setup/doctype/territory/territory.txt b/setup/doctype/territory/territory.txt index 653606687c..bba7e3ead3 100644 --- a/setup/doctype/territory/territory.txt +++ b/setup/doctype/territory/territory.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:24", "docstatus": 0, - "modified": "2013-01-22 14:57:26", + "modified": "2013-07-05 14:58:15", "modified_by": "Administrator", "owner": "Administrator" }, @@ -12,6 +12,7 @@ "description": "Classification of Customers by region", "doctype": "DocType", "document_type": "Master", + "icon": "icon-map-marker", "in_create": 1, "module": "Setup", "name": "__common__", diff --git a/setup/doctype/uom/uom.txt b/setup/doctype/uom/uom.txt index 733eb659b3..ac15095d19 100644 --- a/setup/doctype/uom/uom.txt +++ b/setup/doctype/uom/uom.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:24", "docstatus": 0, - "modified": "2013-01-22 14:57:26", + "modified": "2013-07-05 15:02:01", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "autoname": "field:uom_name", "doctype": "DocType", "document_type": "Master", + "icon": "icon-compass", "module": "Setup", "name": "__common__" }, diff --git a/setup/doctype/warehouse_type/warehouse_type.txt b/setup/doctype/warehouse_type/warehouse_type.txt index a43122155f..31df7d6ff9 100644 --- a/setup/doctype/warehouse_type/warehouse_type.txt +++ b/setup/doctype/warehouse_type/warehouse_type.txt @@ -2,13 +2,14 @@ { "creation": "2013-01-10 16:34:24", "docstatus": 0, - "modified": "2013-01-22 14:57:27", + "modified": "2013-07-05 15:02:15", "modified_by": "Administrator", "owner": "Administrator" }, { "autoname": "field:warehouse_type", "doctype": "DocType", + "icon": "icon-flag", "istable": 0, "module": "Setup", "name": "__common__" diff --git a/stock/doctype/batch/batch.txt b/stock/doctype/batch/batch.txt index c6ed3c370a..5b7a8409ab 100644 --- a/stock/doctype/batch/batch.txt +++ b/stock/doctype/batch/batch.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-05 14:50:38", "docstatus": 0, - "modified": "2013-05-01 15:49:47", + "modified": "2013-07-05 14:26:48", "modified_by": "Administrator", "owner": "harshada@webnotestech.com" }, @@ -11,6 +11,7 @@ "autoname": "field:batch_id", "doctype": "DocType", "document_type": "Master", + "icon": "icon-archive", "max_attachments": 5, "module": "Stock", "name": "__common__" diff --git a/stock/doctype/delivery_note/delivery_note.txt b/stock/doctype/delivery_note/delivery_note.txt index 25430d09ae..99c3dcaa27 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-07-05 10:43:08", + "modified": "2013-07-05 14:34:50", "modified_by": "Administrator", "owner": "Administrator" }, @@ -12,6 +12,7 @@ "doctype": "DocType", "document_type": "Transaction", "hide_toolbar": 0, + "icon": "icon-truck", "in_create": 0, "is_submittable": 1, "module": "Stock", diff --git a/stock/doctype/item/item.txt b/stock/doctype/item/item.txt index 099b532454..548be2f49c 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-05 10:24:36", + "modified": "2013-07-05 14:43:01", "modified_by": "Administrator", "owner": "Administrator" }, @@ -14,6 +14,7 @@ "description": "A Product or a Service that is bought, sold or kept in stock.", "doctype": "DocType", "document_type": "Master", + "icon": "icon-circle", "max_attachments": 1, "module": "Stock", "name": "__common__", diff --git a/stock/doctype/landed_cost_wizard/landed_cost_wizard.txt b/stock/doctype/landed_cost_wizard/landed_cost_wizard.txt index d27fa83200..36a5d727b9 100644 --- a/stock/doctype/landed_cost_wizard/landed_cost_wizard.txt +++ b/stock/doctype/landed_cost_wizard/landed_cost_wizard.txt @@ -2,12 +2,13 @@ { "creation": "2013-01-22 16:50:39", "docstatus": 0, - "modified": "2013-01-22 16:54:49", + "modified": "2013-07-05 14:43:57", "modified_by": "Administrator", "owner": "wasim@webnotestech.com" }, { "doctype": "DocType", + "icon": "icon-magic", "issingle": 1, "module": "Stock", "name": "__common__" diff --git a/stock/doctype/material_request/material_request.txt b/stock/doctype/material_request/material_request.txt index 7ebb1974e4..ad9450386d 100644 --- a/stock/doctype/material_request/material_request.txt +++ b/stock/doctype/material_request/material_request.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-07 14:48:38", "docstatus": 0, - "modified": "2013-07-04 10:24:53", + "modified": "2013-07-05 14:46:13", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "allow_print": 0, "autoname": "naming_series:", "doctype": "DocType", + "icon": "icon-ticket", "is_submittable": 1, "module": "Stock", "name": "__common__", diff --git a/stock/doctype/packing_slip/packing_slip.txt b/stock/doctype/packing_slip/packing_slip.txt index ed33e3ff2a..3252ef82db 100644 --- a/stock/doctype/packing_slip/packing_slip.txt +++ b/stock/doctype/packing_slip/packing_slip.txt @@ -2,7 +2,7 @@ { "creation": "2013-04-11 15:32:24", "docstatus": 0, - "modified": "2013-06-11 16:16:37", + "modified": "2013-07-05 14:47:57", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "description": "Generate packing slips for packages to be delivered. Used to notify package number, package contents and its weight.", "doctype": "DocType", "document_type": "Transaction", + "icon": "icon-suitcase", "is_submittable": 1, "module": "Stock", "name": "__common__", diff --git a/stock/doctype/purchase_receipt/purchase_receipt.txt b/stock/doctype/purchase_receipt/purchase_receipt.txt index 802d542a02..ab5bc1b56f 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-07-05 10:46:56", + "modified": "2013-07-05 14:52:08", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "autoname": "naming_series:", "doctype": "DocType", "document_type": "Transaction", + "icon": "icon-truck", "is_submittable": 1, "module": "Stock", "name": "__common__", diff --git a/stock/doctype/serial_no/serial_no.txt b/stock/doctype/serial_no/serial_no.txt index 20f074b1ac..72f7828636 100644 --- a/stock/doctype/serial_no/serial_no.txt +++ b/stock/doctype/serial_no/serial_no.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-16 10:59:15", "docstatus": 0, - "modified": "2013-07-02 12:07:21", + "modified": "2013-07-05 14:54:52", "modified_by": "Administrator", "owner": "Administrator" }, @@ -13,6 +13,7 @@ "description": "Distinct unit of an Item", "doctype": "DocType", "document_type": "Master", + "icon": "icon-barcode", "module": "Stock", "name": "__common__", "search_fields": "item_code,status" diff --git a/stock/doctype/stock_entry/stock_entry.txt b/stock/doctype/stock_entry/stock_entry.txt index d88b0b76fd..682c054f83 100644 --- a/stock/doctype/stock_entry/stock_entry.txt +++ b/stock/doctype/stock_entry/stock_entry.txt @@ -2,7 +2,7 @@ { "creation": "2013-04-09 11:43:55", "docstatus": 0, - "modified": "2013-05-09 13:31:00", + "modified": "2013-07-05 14:56:06", "modified_by": "Administrator", "owner": "Administrator" }, @@ -16,6 +16,7 @@ "doctype": "DocType", "hide_heading": 0, "hide_toolbar": 0, + "icon": "icon-file-text", "in_create": 0, "in_dialog": 0, "is_submittable": 1, diff --git a/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt b/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt index 674104dfeb..38005f7769 100644 --- a/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt +++ b/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-29 19:25:42", "docstatus": 0, - "modified": "2013-06-28 12:39:07", + "modified": "2013-07-05 14:56:15", "modified_by": "Administrator", "owner": "Administrator" }, @@ -14,6 +14,7 @@ "doctype": "DocType", "document_type": "Other", "hide_toolbar": 1, + "icon": "icon-list", "in_create": 1, "module": "Stock", "name": "__common__" diff --git a/stock/doctype/stock_reconciliation/stock_reconciliation.txt b/stock/doctype/stock_reconciliation/stock_reconciliation.txt index 9b5b2a128a..fc63b8dcd5 100644 --- a/stock/doctype/stock_reconciliation/stock_reconciliation.txt +++ b/stock/doctype/stock_reconciliation/stock_reconciliation.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-28 10:35:31", "docstatus": 0, - "modified": "2013-04-10 13:44:19", + "modified": "2013-07-05 14:56:37", "modified_by": "Administrator", "owner": "Administrator" }, @@ -14,6 +14,7 @@ "autoname": "SR/.######", "description": "This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.", "doctype": "DocType", + "icon": "icon-upload-alt", "is_submittable": 1, "max_attachments": 1, "module": "Stock", diff --git a/stock/doctype/stock_settings/stock_settings.txt b/stock/doctype/stock_settings/stock_settings.txt index 36b298a465..e8edd0359a 100644 --- a/stock/doctype/stock_settings/stock_settings.txt +++ b/stock/doctype/stock_settings/stock_settings.txt @@ -2,13 +2,14 @@ { "creation": "2013-06-24 16:37:54", "docstatus": 0, - "modified": "2013-06-24 17:41:02", + "modified": "2013-07-05 14:56:41", "modified_by": "Administrator", "owner": "Administrator" }, { "description": "Settings", "doctype": "DocType", + "icon": "icon-cog", "issingle": 1, "module": "Stock", "name": "__common__" diff --git a/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.txt b/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.txt index 1efac0904e..d820b01649 100644 --- a/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.txt +++ b/stock/doctype/stock_uom_replace_utility/stock_uom_replace_utility.txt @@ -2,12 +2,13 @@ { "creation": "2013-01-10 16:34:30", "docstatus": 0, - "modified": "2013-01-22 13:57:23", + "modified": "2013-07-05 14:56:45", "modified_by": "Administrator", "owner": "Administrator" }, { "doctype": "DocType", + "icon": "icon-magic", "in_create": 0, "issingle": 1, "module": "Stock", diff --git a/stock/doctype/warehouse/warehouse.txt b/stock/doctype/warehouse/warehouse.txt index d08b3ccff3..38734081a7 100644 --- a/stock/doctype/warehouse/warehouse.txt +++ b/stock/doctype/warehouse/warehouse.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-07 18:50:32", "docstatus": 0, - "modified": "2013-03-11 17:58:45", + "modified": "2013-07-05 15:02:12", "modified_by": "Administrator", "owner": "Administrator" }, @@ -12,6 +12,7 @@ "description": "A logical Warehouse against which stock entries are made.", "doctype": "DocType", "document_type": "Master", + "icon": "icon-building", "module": "Stock", "name": "__common__", "search_fields": "warehouse_type" diff --git a/support/doctype/customer_issue/customer_issue.txt b/support/doctype/customer_issue/customer_issue.txt index 2f6743710b..1850f57189 100644 --- a/support/doctype/customer_issue/customer_issue.txt +++ b/support/doctype/customer_issue/customer_issue.txt @@ -2,13 +2,14 @@ { "creation": "2013-01-10 16:34:30", "docstatus": 0, - "modified": "2013-07-05 12:31:46", + "modified": "2013-07-05 14:34:37", "modified_by": "Administrator", "owner": "harshada@webnotestech.com" }, { "autoname": "naming_series:", "doctype": "DocType", + "icon": "icon-bug", "is_submittable": 1, "module": "Support", "name": "__common__", diff --git a/support/doctype/maintenance_schedule/maintenance_schedule.txt b/support/doctype/maintenance_schedule/maintenance_schedule.txt index ba46555bde..63148dcaa0 100644 --- a/support/doctype/maintenance_schedule/maintenance_schedule.txt +++ b/support/doctype/maintenance_schedule/maintenance_schedule.txt @@ -2,13 +2,14 @@ { "creation": "2013-01-10 16:34:30", "docstatus": 0, - "modified": "2013-06-11 16:16:37", + "modified": "2013-07-05 14:45:42", "modified_by": "Administrator", "owner": "Administrator" }, { "autoname": "MS.#####", "doctype": "DocType", + "icon": "icon-calendar", "is_submittable": 1, "module": "Support", "name": "__common__", diff --git a/support/doctype/maintenance_visit/maintenance_visit.txt b/support/doctype/maintenance_visit/maintenance_visit.txt index 919c003c78..5f9bb1b3d0 100644 --- a/support/doctype/maintenance_visit/maintenance_visit.txt +++ b/support/doctype/maintenance_visit/maintenance_visit.txt @@ -2,13 +2,14 @@ { "creation": "2013-01-10 16:34:31", "docstatus": 0, - "modified": "2013-06-11 16:16:37", + "modified": "2013-07-05 14:45:54", "modified_by": "Administrator", "owner": "ashwini@webnotestech.com" }, { "autoname": "MV.#####", "doctype": "DocType", + "icon": "icon-file-text", "is_submittable": 1, "module": "Support", "name": "__common__", diff --git a/support/doctype/newsletter/newsletter.txt b/support/doctype/newsletter/newsletter.txt index dbab81ee0a..e760135b66 100644 --- a/support/doctype/newsletter/newsletter.txt +++ b/support/doctype/newsletter/newsletter.txt @@ -2,7 +2,7 @@ { "creation": "2013-01-10 16:34:31", "docstatus": 0, - "modified": "2013-02-11 17:23:08", + "modified": "2013-07-05 14:47:08", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "description": "Create and Send Newsletters", "doctype": "DocType", "document_type": "Other", + "icon": "icon-envelope", "module": "Support", "name": "__common__" }, diff --git a/support/doctype/support_ticket/support_ticket.txt b/support/doctype/support_ticket/support_ticket.txt index 491074f9ea..44801eef78 100644 --- a/support/doctype/support_ticket/support_ticket.txt +++ b/support/doctype/support_ticket/support_ticket.txt @@ -2,7 +2,7 @@ { "creation": "2013-02-01 10:36:25", "docstatus": 0, - "modified": "2013-07-05 12:27:54", + "modified": "2013-07-05 14:57:19", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "allow_attach": 1, "autoname": "naming_series:", "doctype": "DocType", + "icon": "icon-ticket", "module": "Support", "name": "__common__", "search_fields": "status,customer,allocated_to,subject,raised_by" diff --git a/utilities/doctype/address/address.txt b/utilities/doctype/address/address.txt index 1f65794fb7..edc7ac739e 100644 --- a/utilities/doctype/address/address.txt +++ b/utilities/doctype/address/address.txt @@ -2,13 +2,14 @@ { "creation": "2013-01-10 16:34:32", "docstatus": 0, - "modified": "2013-07-05 11:45:06", + "modified": "2013-07-05 14:24:00", "modified_by": "Administrator", "owner": "Administrator" }, { "doctype": "DocType", "document_type": "Master", + "icon": "icon-map-marker", "in_dialog": 0, "module": "Utilities", "name": "__common__", diff --git a/utilities/doctype/contact/contact.txt b/utilities/doctype/contact/contact.txt index d9e95266dd..63d02521db 100644 --- a/utilities/doctype/contact/contact.txt +++ b/utilities/doctype/contact/contact.txt @@ -2,13 +2,14 @@ { "creation": "2013-01-10 16:34:32", "docstatus": 0, - "modified": "2013-07-05 11:43:50", + "modified": "2013-07-05 14:32:19", "modified_by": "Administrator", "owner": "Administrator" }, { "doctype": "DocType", "document_type": "Master", + "icon": "icon-user", "in_create": 0, "in_dialog": 0, "module": "Utilities", diff --git a/utilities/doctype/note/note.txt b/utilities/doctype/note/note.txt index a6cdf2bf20..5c6b7713bb 100644 --- a/utilities/doctype/note/note.txt +++ b/utilities/doctype/note/note.txt @@ -2,7 +2,7 @@ { "creation": "2013-05-24 13:41:00", "docstatus": 0, - "modified": "2013-05-27 12:16:46", + "modified": "2013-07-05 14:47:11", "modified_by": "Administrator", "owner": "Administrator" }, @@ -12,6 +12,7 @@ "description": "Note is a free page where users can share documents / notes", "doctype": "DocType", "document_type": "Transaction", + "icon": "icon-file-text", "module": "Utilities", "name": "__common__", "read_only_onload": 1 diff --git a/utilities/doctype/rename_tool/rename_tool.txt b/utilities/doctype/rename_tool/rename_tool.txt index 20c2561556..e397cf3de4 100644 --- a/utilities/doctype/rename_tool/rename_tool.txt +++ b/utilities/doctype/rename_tool/rename_tool.txt @@ -2,7 +2,7 @@ { "creation": "2012-12-03 10:25:59", "docstatus": 0, - "modified": "2013-03-26 12:46:07", + "modified": "2013-07-05 14:52:51", "modified_by": "Administrator", "owner": "Administrator" }, @@ -13,6 +13,7 @@ "doctype": "DocType", "hide_heading": 0, "hide_toolbar": 1, + "icon": "icon-magic", "issingle": 1, "max_attachments": 1, "module": "Utilities", diff --git a/utilities/doctype/sms_control/sms_control.txt b/utilities/doctype/sms_control/sms_control.txt index 06b4b7bcb8..bd63dab3d2 100644 --- a/utilities/doctype/sms_control/sms_control.txt +++ b/utilities/doctype/sms_control/sms_control.txt @@ -2,12 +2,13 @@ { "creation": "2013-01-10 16:34:32", "docstatus": 0, - "modified": "2013-01-22 14:57:24", + "modified": "2013-07-05 14:55:40", "modified_by": "Administrator", "owner": "Administrator" }, { "doctype": "DocType", + "icon": "icon-mobile-phone", "in_create": 0, "issingle": 1, "module": "Utilities", diff --git a/utilities/doctype/sms_log/sms_log.txt b/utilities/doctype/sms_log/sms_log.txt index 37ca4c6f1a..094adfd660 100644 --- a/utilities/doctype/sms_log/sms_log.txt +++ b/utilities/doctype/sms_log/sms_log.txt @@ -2,18 +2,16 @@ { "creation": "2012-03-27 14:36:47", "docstatus": 0, - "modified": "2012-03-27 14:36:47", + "modified": "2013-07-05 14:55:45", "modified_by": "Administrator", "owner": "Administrator" }, { "autoname": "SMSLOG/.########", "doctype": "DocType", + "icon": "icon-mobile-phone", "module": "Utilities", - "name": "__common__", - "section_style": "Simple", - "show_in_menu": 0, - "version": 3 + "name": "__common__" }, { "doctype": "DocField", @@ -40,9 +38,6 @@ "doctype": "DocType", "name": "SMS Log" }, - { - "doctype": "DocPerm" - }, { "doctype": "DocField", "fieldname": "column_break0", @@ -90,5 +85,8 @@ "fieldname": "message", "fieldtype": "Small Text", "label": "Message" + }, + { + "doctype": "DocPerm" } ] \ No newline at end of file diff --git a/website/doctype/about_us_settings/about_us_settings.txt b/website/doctype/about_us_settings/about_us_settings.txt index baf9cc0af8..0e34d67083 100644 --- a/website/doctype/about_us_settings/about_us_settings.txt +++ b/website/doctype/about_us_settings/about_us_settings.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-19 12:02:15", "docstatus": 0, - "modified": "2013-05-03 11:01:30", + "modified": "2013-07-05 14:23:27", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "description": "Settings for the About Us Page", "doctype": "DocType", "document_type": "Other", + "icon": "icon-group", "issingle": 1, "module": "Website", "name": "__common__" diff --git a/website/doctype/blog_category/blog_category.txt b/website/doctype/blog_category/blog_category.txt index d55d39cd46..b986c441a5 100644 --- a/website/doctype/blog_category/blog_category.txt +++ b/website/doctype/blog_category/blog_category.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-08 09:41:11", "docstatus": 0, - "modified": "2013-06-18 18:36:28", + "modified": "2013-07-05 14:27:02", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "autoname": "field:category_name", "doctype": "DocType", "document_type": "Master", + "icon": "icon-tag", "module": "Website", "name": "__common__" }, diff --git a/website/doctype/blog_post/blog_post.txt b/website/doctype/blog_post/blog_post.txt index 07c53926a9..79c1aee94f 100644 --- a/website/doctype/blog_post/blog_post.txt +++ b/website/doctype/blog_post/blog_post.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-28 10:35:30", "docstatus": 0, - "modified": "2013-03-18 13:55:53", + "modified": "2013-07-05 15:08:30", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "allow_attach": 1, "allow_import": 1, "doctype": "DocType", + "icon": "icon-quote-left", "max_attachments": 5, "module": "Website", "name": "__common__" diff --git a/website/doctype/blog_settings/blog_settings.txt b/website/doctype/blog_settings/blog_settings.txt index 09740eb78f..27fa5630dd 100644 --- a/website/doctype/blog_settings/blog_settings.txt +++ b/website/doctype/blog_settings/blog_settings.txt @@ -2,13 +2,14 @@ { "creation": "2013-03-11 17:48:16", "docstatus": 0, - "modified": "2013-03-11 17:48:16", + "modified": "2013-07-05 14:27:31", "modified_by": "Administrator", "owner": "Administrator" }, { "description": "Blog Settings", "doctype": "DocType", + "icon": "icon-cog", "issingle": 1, "module": "Website", "name": "__common__" diff --git a/website/doctype/blogger/blogger.txt b/website/doctype/blogger/blogger.txt index da065c52f6..e2b4367efb 100644 --- a/website/doctype/blogger/blogger.txt +++ b/website/doctype/blogger/blogger.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-25 16:00:51", "docstatus": 0, - "modified": "2013-03-29 10:37:37", + "modified": "2013-07-05 14:27:34", "modified_by": "Administrator", "owner": "Administrator" }, @@ -12,6 +12,7 @@ "description": "Profile of a Blogger", "doctype": "DocType", "document_type": "Master", + "icon": "icon-user", "max_attachments": 1, "module": "Website", "name": "__common__" diff --git a/website/doctype/contact_us_settings/contact_us_settings.txt b/website/doctype/contact_us_settings/contact_us_settings.txt index ef2da02af7..21db27efce 100644 --- a/website/doctype/contact_us_settings/contact_us_settings.txt +++ b/website/doctype/contact_us_settings/contact_us_settings.txt @@ -2,13 +2,14 @@ { "creation": "2013-02-21 20:12:42", "docstatus": 0, - "modified": "2013-03-12 14:49:01", + "modified": "2013-07-05 14:32:24", "modified_by": "Administrator", "owner": "Administrator" }, { "description": "Settings for Contact Us Page", "doctype": "DocType", + "icon": "icon-cog", "issingle": 1, "module": "Website", "name": "__common__" diff --git a/website/doctype/shopping_cart_settings/shopping_cart_settings.txt b/website/doctype/shopping_cart_settings/shopping_cart_settings.txt index 1d472b7f1b..8cb148041a 100644 --- a/website/doctype/shopping_cart_settings/shopping_cart_settings.txt +++ b/website/doctype/shopping_cart_settings/shopping_cart_settings.txt @@ -2,13 +2,14 @@ { "creation": "2013-06-19 15:57:32", "docstatus": 0, - "modified": "2013-07-03 21:01:00", + "modified": "2013-07-05 14:55:05", "modified_by": "Administrator", "owner": "Administrator" }, { "description": "Default settings for Shopping Cart", "doctype": "DocType", + "icon": "icon-shopping-cart", "issingle": 1, "module": "Website", "name": "__common__" diff --git a/website/doctype/style_settings/style_settings.txt b/website/doctype/style_settings/style_settings.txt index e31713aa5f..7119d2c250 100644 --- a/website/doctype/style_settings/style_settings.txt +++ b/website/doctype/style_settings/style_settings.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-25 16:01:33", "docstatus": 0, - "modified": "2013-03-14 11:57:20", + "modified": "2013-07-05 14:57:01", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "allow_attach": 1, "description": "Set your background color, font and image (tiled)", "doctype": "DocType", + "icon": "icon-cog", "issingle": 1, "max_attachments": 1, "module": "Website", diff --git a/website/doctype/web_page/web_page.txt b/website/doctype/web_page/web_page.txt index effe06433d..34fa266928 100644 --- a/website/doctype/web_page/web_page.txt +++ b/website/doctype/web_page/web_page.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-28 10:35:30", "docstatus": 0, - "modified": "2013-03-11 17:41:11", + "modified": "2013-07-05 15:02:45", "modified_by": "Administrator", "owner": "Administrator" }, @@ -11,6 +11,7 @@ "description": "Page to show on the website\n", "doctype": "DocType", "document_type": "Transaction", + "icon": "icon-file-alt", "max_attachments": 20, "module": "Website", "name": "__common__" @@ -148,7 +149,6 @@ "cancel": 0, "create": 0, "doctype": "DocPerm", - "match": "", "permlevel": 1 } ] \ No newline at end of file diff --git a/website/doctype/website_script/website_script.txt b/website/doctype/website_script/website_script.txt index cf22537bf8..ae22a345dc 100644 --- a/website/doctype/website_script/website_script.txt +++ b/website/doctype/website_script/website_script.txt @@ -1,46 +1,47 @@ [ { - "owner": "Administrator", - "docstatus": 0, "creation": "2012-12-27 11:51:24", + "docstatus": 0, + "modified": "2013-07-05 15:02:48", "modified_by": "Administrator", - "modified": "2012-12-27 12:25:04" + "owner": "Administrator" }, { - "issingle": 1, "description": "Script to attach to all web pages.", "doctype": "DocType", - "module": "Website", "document_type": "Other", + "icon": "icon-code", + "issingle": 1, + "module": "Website", "name": "__common__" }, { - "parent": "Website Script", "doctype": "DocField", - "name": "__common__", - "label": "Javascript", - "parenttype": "DocType", - "options": "Javascript", "fieldname": "javascript", "fieldtype": "Code", - "permlevel": 0, - "parentfield": "fields" + "label": "Javascript", + "name": "__common__", + "options": "Javascript", + "parent": "Website Script", + "parentfield": "fields", + "parenttype": "DocType", + "permlevel": 0 }, { - "parent": "Website Script", - "read": 1, - "name": "__common__", "create": 1, "doctype": "DocPerm", - "write": 1, + "name": "__common__", + "parent": "Website Script", + "parentfield": "permissions", "parenttype": "DocType", - "role": "Website Manager", "permlevel": 0, - "parentfield": "permissions" + "read": 1, + "role": "Website Manager", + "write": 1 }, { - "name": "Website Script", - "doctype": "DocType" + "doctype": "DocType", + "name": "Website Script" }, { "doctype": "DocField" diff --git a/website/doctype/website_settings/website_settings.txt b/website/doctype/website_settings/website_settings.txt index 9c15480f07..b3828a22f4 100644 --- a/website/doctype/website_settings/website_settings.txt +++ b/website/doctype/website_settings/website_settings.txt @@ -2,7 +2,7 @@ { "creation": "2013-04-30 12:58:46", "docstatus": 0, - "modified": "2013-05-02 15:51:14", + "modified": "2013-07-05 15:02:50", "modified_by": "Administrator", "owner": "Administrator" }, @@ -10,6 +10,7 @@ "allow_attach": 1, "doctype": "DocType", "document_type": "Other", + "icon": "icon-cog", "issingle": 1, "max_attachments": 10, "module": "Website", diff --git a/website/doctype/website_slideshow/website_slideshow.txt b/website/doctype/website_slideshow/website_slideshow.txt index e67e1f8ca1..e8ca08e4f6 100644 --- a/website/doctype/website_slideshow/website_slideshow.txt +++ b/website/doctype/website_slideshow/website_slideshow.txt @@ -2,7 +2,7 @@ { "creation": "2013-03-07 15:53:15", "docstatus": 0, - "modified": "2013-05-28 16:57:32", + "modified": "2013-07-05 15:03:30", "modified_by": "Administrator", "owner": "Administrator" }, @@ -12,6 +12,7 @@ "description": "Slideshow like display for the website", "doctype": "DocType", "document_type": "Transaction", + "icon": "icon-play", "max_attachments": 10, "module": "Website", "name": "__common__"