From e953f0bb971fbdd30647495386e39fb2428a46d5 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 5 Jul 2013 10:48:35 +0530 Subject: [PATCH 1/2] [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/2] [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",