diff --git a/erpnext/accounts/page/accounts_browser/accounts_browser.js b/erpnext/accounts/page/accounts_browser/accounts_browser.js index 43a4fb4c19..efbb13a5dc 100644 --- a/erpnext/accounts/page/accounts_browser/accounts_browser.js +++ b/erpnext/accounts/page/accounts_browser/accounts_browser.js @@ -75,11 +75,6 @@ pscript['onload_Accounts Browser'] = function(wrapper){ } pscript.set_title = function(wrapper, ctype, val) { - if(val) { - wrapper.page.set_title('Chart of '+ctype+'s' + " - " + cstr(val)); - } else { - wrapper.page.set_title('Chart of '+ctype+'s'); - } } pscript['onshow_Accounts Browser'] = function(wrapper){ @@ -106,7 +101,7 @@ erpnext.AccountsChart = Class.extend({ me.company = company; this.tree = new frappe.ui.Tree({ parent: $(wrapper), - label: ctype==="Account" ? "Accounts" : "Cost Centers", + label: ctype==="Account" ? __("Accounts") : __("Cost Centers"), args: {ctype: ctype, comp: company}, method: 'erpnext.accounts.page.accounts_browser.accounts_browser.get_children', click: function(link) { @@ -182,6 +177,14 @@ erpnext.AccountsChart = Class.extend({ } }); }, + set_title: function(val) { + var chart_str = this.ctype=="Account" ? __("Chart of Accounts") : __("Chart of Cost Centers"); + if(val) { + wrapper.page.set_title(chart_str + " - " + cstr(val)); + } else { + wrapper.page.set_title(chart_str); + } + }, new_account: function() { var me = this; diff --git a/erpnext/buying/doctype/purchase_order/purchase_order_list.html b/erpnext/buying/doctype/purchase_order/purchase_order_list.html deleted file mode 100644 index a2031c0bf0..0000000000 --- a/erpnext/buying/doctype/purchase_order/purchase_order_list.html +++ /dev/null @@ -1,39 +0,0 @@ -
-
-
- {%= list.get_avatar_and_id(doc) %} - - - {%= doc.supplier_name %} - {% if(doc.per_received < 100 && doc.status!=="Stopped") { %} - - {%= __("Pending") %} - - {% } %} - {% if(doc.status==="Stopped" || doc.status==="Draft") { %} - {%= __(doc.status) %} - {% } %} - {% if(doc.per_received == 100 && doc.status!=="Stopped") { %} - - - {% } %} -
-
-
- {% var completed = doc.per_received, title = __("Received") %} - {% include "templates/form_grid/includes/progress.html" %} -
-
- {% var completed = doc.per_billed, title = __("Billed") %} - {% include "templates/form_grid/includes/progress.html" %} -
-
-
- {%= doc.get_formatted("grand_total_import") %} -
-
-
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order_list.js b/erpnext/buying/doctype/purchase_order/purchase_order_list.js index de8b3fa46e..fe96641568 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order_list.js +++ b/erpnext/buying/doctype/purchase_order/purchase_order_list.js @@ -1,4 +1,15 @@ frappe.listview_settings['Purchase Order'] = { add_fields: ["grand_total", "company", "currency", "supplier", - "supplier_name", "per_received", "per_billed", "status"] + "supplier_name", "per_received", "per_billed", "status"], + get_indicator: function(doc) { + if(doc.status==="Stopped") { + return [__("Stopped"), "red", "status,=,Stopped"]; + } else if(doc.per_received < 100 && doc.status!=="Stopped") { + return [__("Not Received"), "orange", "per_received,<,100|status,!=,Stopped"]; + } else if(doc.per_received == 100 && doc.per_billed < 100 && doc.status!=="Stopped") { + return [__("To Bill"), "orange", "per_received,=,100|per_billed,<,100|status,!=,Stopped"]; + } else if(doc.per_received == 100 && doc.per_billed == 100 && doc.status!=="Stopped") { + return [__("Completed"), "green", "per_received,=,100|per_billed,=,100|status,!=,Stopped"]; + } + } }; diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json index f1fa8aea2e..90a0594a4e 100644 --- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json +++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json @@ -1,668 +1,669 @@ { - "allow_import": 1, - "autoname": "naming_series:", - "creation": "2013-05-21 16:16:45", - "docstatus": 0, - "doctype": "DocType", - "document_type": "Transaction", + "allow_import": 1, + "autoname": "naming_series:", + "creation": "2013-05-21 16:16:45", + "docstatus": 0, + "doctype": "DocType", + "document_type": "Transaction", "fields": [ { - "fieldname": "supplier_section", - "fieldtype": "Section Break", - "label": "Supplier", - "options": "icon-user", + "fieldname": "supplier_section", + "fieldtype": "Section Break", + "label": "Supplier", + "options": "icon-user", "permlevel": 0 - }, + }, { - "fieldname": "naming_series", - "fieldtype": "Select", - "label": "Series", - "no_copy": 1, - "oldfieldname": "naming_series", - "oldfieldtype": "Select", - "options": "SQTN-", - "permlevel": 0, - "print_hide": 1, + "fieldname": "naming_series", + "fieldtype": "Select", + "label": "Series", + "no_copy": 1, + "oldfieldname": "naming_series", + "oldfieldtype": "Select", + "options": "SQTN-", + "permlevel": 0, + "print_hide": 1, "reqd": 1 - }, + }, { - "description": "Supplier (vendor) name as entered in supplier master", - "fieldname": "supplier", - "fieldtype": "Link", - "in_filter": 1, - "label": "Supplier", - "oldfieldname": "supplier", - "oldfieldtype": "Link", - "options": "Supplier", - "permlevel": 0, - "print_hide": 1, - "reqd": 1, + "description": "Supplier (vendor) name as entered in supplier master", + "fieldname": "supplier", + "fieldtype": "Link", + "in_filter": 1, + "label": "Supplier", + "oldfieldname": "supplier", + "oldfieldtype": "Link", + "options": "Supplier", + "permlevel": 0, + "print_hide": 1, + "reqd": 1, "search_index": 1 - }, + }, { - "fieldname": "supplier_name", - "fieldtype": "Data", - "hidden": 0, - "in_list_view": 1, - "label": "Name", - "permlevel": 0, + "fieldname": "supplier_name", + "fieldtype": "Data", + "hidden": 0, + "in_list_view": 0, + "label": "Name", + "permlevel": 0, "read_only": 1 - }, + }, { - "fieldname": "address_display", - "fieldtype": "Small Text", - "hidden": 1, - "label": "Address", - "permlevel": 0, + "fieldname": "address_display", + "fieldtype": "Small Text", + "hidden": 1, + "label": "Address", + "permlevel": 0, "read_only": 1 - }, + }, { - "fieldname": "contact_display", - "fieldtype": "Small Text", - "hidden": 1, - "label": "Contact", - "permlevel": 0, + "fieldname": "contact_display", + "fieldtype": "Small Text", + "hidden": 1, + "label": "Contact", + "permlevel": 0, "read_only": 1 - }, + }, { - "fieldname": "contact_mobile", - "fieldtype": "Small Text", - "hidden": 1, - "label": "Mobile No", - "permlevel": 0, + "fieldname": "contact_mobile", + "fieldtype": "Small Text", + "hidden": 1, + "label": "Mobile No", + "permlevel": 0, "read_only": 1 - }, + }, { - "fieldname": "contact_email", - "fieldtype": "Small Text", - "hidden": 1, - "label": "Contact Email", - "permlevel": 0, - "print_hide": 1, + "fieldname": "contact_email", + "fieldtype": "Small Text", + "hidden": 1, + "label": "Contact Email", + "permlevel": 0, + "print_hide": 1, "read_only": 1 - }, + }, { - "fieldname": "column_break1", - "fieldtype": "Column Break", - "oldfieldtype": "Column Break", - "permlevel": 0, - "print_hide": 0, - "print_width": "50%", + "fieldname": "column_break1", + "fieldtype": "Column Break", + "oldfieldtype": "Column Break", + "permlevel": 0, + "print_hide": 0, + "print_width": "50%", "width": "50%" - }, + }, { - "fieldname": "transaction_date", - "fieldtype": "Date", - "in_filter": 1, - "label": "Date", - "oldfieldname": "transaction_date", - "oldfieldtype": "Date", - "permlevel": 0, - "reqd": 1, + "fieldname": "transaction_date", + "fieldtype": "Date", + "in_filter": 1, + "label": "Date", + "oldfieldname": "transaction_date", + "oldfieldtype": "Date", + "permlevel": 0, + "reqd": 1, "search_index": 1 - }, + }, { - "fieldname": "amended_from", - "fieldtype": "Link", - "hidden": 1, - "ignore_user_permissions": 1, - "label": "Amended From", - "no_copy": 1, - "oldfieldname": "amended_from", - "oldfieldtype": "Data", - "options": "Supplier Quotation", - "permlevel": 0, - "print_hide": 1, - "read_only": 1, + "fieldname": "amended_from", + "fieldtype": "Link", + "hidden": 1, + "ignore_user_permissions": 1, + "label": "Amended From", + "no_copy": 1, + "oldfieldname": "amended_from", + "oldfieldtype": "Data", + "options": "Supplier Quotation", + "permlevel": 0, + "print_hide": 1, + "read_only": 1, "report_hide": 0 - }, + }, { - "description": "Select the relevant company name if you have multiple companies", - "fieldname": "company", - "fieldtype": "Link", - "in_filter": 1, - "label": "Company", - "no_copy": 0, - "oldfieldname": "company", - "oldfieldtype": "Link", - "options": "Company", - "permlevel": 0, - "print_hide": 1, - "reqd": 1, + "description": "Select the relevant company name if you have multiple companies", + "fieldname": "company", + "fieldtype": "Link", + "in_filter": 1, + "label": "Company", + "no_copy": 0, + "oldfieldname": "company", + "oldfieldtype": "Link", + "options": "Company", + "permlevel": 0, + "print_hide": 1, + "reqd": 1, "search_index": 1 - }, + }, { - "fieldname": "currency_price_list", - "fieldtype": "Section Break", - "label": "Currency and Price List", - "options": "icon-tag", + "fieldname": "currency_price_list", + "fieldtype": "Section Break", + "label": "Currency and Price List", + "options": "icon-tag", "permlevel": 0 - }, + }, { - "fieldname": "currency", - "fieldtype": "Link", - "label": "Currency", - "no_copy": 0, - "oldfieldname": "currency", - "oldfieldtype": "Select", - "options": "Currency", - "permlevel": 0, - "print_hide": 1, + "fieldname": "currency", + "fieldtype": "Link", + "label": "Currency", + "no_copy": 0, + "oldfieldname": "currency", + "oldfieldtype": "Select", + "options": "Currency", + "permlevel": 0, + "print_hide": 1, "reqd": 1 - }, + }, { - "description": "Rate at which supplier's currency is converted to company's base currency", - "fieldname": "conversion_rate", - "fieldtype": "Float", - "hidden": 0, - "label": "Exchange Rate", - "no_copy": 0, - "oldfieldname": "conversion_rate", - "oldfieldtype": "Currency", - "permlevel": 0, - "print_hide": 1, + "description": "Rate at which supplier's currency is converted to company's base currency", + "fieldname": "conversion_rate", + "fieldtype": "Float", + "hidden": 0, + "label": "Exchange Rate", + "no_copy": 0, + "oldfieldname": "conversion_rate", + "oldfieldtype": "Currency", + "permlevel": 0, + "print_hide": 1, "reqd": 1 - }, + }, { - "fieldname": "cb_price_list", - "fieldtype": "Column Break", - "permlevel": 0, - "print_width": "50%", + "fieldname": "cb_price_list", + "fieldtype": "Column Break", + "permlevel": 0, + "print_width": "50%", "width": "50%" - }, + }, { - "fieldname": "buying_price_list", - "fieldtype": "Link", - "label": "Price List", - "options": "Price List", - "permlevel": 0, + "fieldname": "buying_price_list", + "fieldtype": "Link", + "label": "Price List", + "options": "Price List", + "permlevel": 0, "print_hide": 1 - }, + }, { - "depends_on": "buying_price_list", - "fieldname": "price_list_currency", - "fieldtype": "Link", - "label": "Price List Currency", - "options": "Currency", - "permlevel": 0, - "print_hide": 1, + "depends_on": "buying_price_list", + "fieldname": "price_list_currency", + "fieldtype": "Link", + "label": "Price List Currency", + "options": "Currency", + "permlevel": 0, + "print_hide": 1, "read_only": 1 - }, + }, { - "depends_on": "buying_price_list", - "fieldname": "plc_conversion_rate", - "fieldtype": "Float", - "label": "Price List Exchange Rate", - "permlevel": 0, + "depends_on": "buying_price_list", + "fieldname": "plc_conversion_rate", + "fieldtype": "Float", + "label": "Price List Exchange Rate", + "permlevel": 0, "print_hide": 1 - }, + }, { - "fieldname": "ignore_pricing_rule", - "fieldtype": "Check", - "label": "Ignore Pricing Rule", - "no_copy": 1, - "permlevel": 1, + "fieldname": "ignore_pricing_rule", + "fieldtype": "Check", + "label": "Ignore Pricing Rule", + "no_copy": 1, + "permlevel": 1, "print_hide": 1 - }, + }, { - "fieldname": "items_section", - "fieldtype": "Section Break", - "label": "Items", - "oldfieldtype": "Section Break", - "options": "icon-shopping-cart", + "fieldname": "items_section", + "fieldtype": "Section Break", + "label": "Items", + "oldfieldtype": "Section Break", + "options": "icon-shopping-cart", "permlevel": 0 - }, + }, { - "allow_on_submit": 1, - "fieldname": "items", - "fieldtype": "Table", - "label": "Items", - "no_copy": 0, - "oldfieldname": "po_details", - "oldfieldtype": "Table", - "options": "Supplier Quotation Item", + "allow_on_submit": 1, + "fieldname": "items", + "fieldtype": "Table", + "label": "Items", + "no_copy": 0, + "oldfieldname": "po_details", + "oldfieldtype": "Table", + "options": "Supplier Quotation Item", "permlevel": 0 - }, + }, { - "fieldname": "section_break_22", - "fieldtype": "Section Break", + "fieldname": "section_break_22", + "fieldtype": "Section Break", "permlevel": 0 - }, + }, { - "fieldname": "net_total", - "fieldtype": "Currency", - "label": "Net Total (Company Currency)", - "no_copy": 1, - "oldfieldname": "net_total", - "oldfieldtype": "Currency", - "options": "Company:company:default_currency", - "permlevel": 0, - "print_hide": 1, - "read_only": 1, + "fieldname": "net_total", + "fieldtype": "Currency", + "label": "Net Total (Company Currency)", + "no_copy": 1, + "oldfieldname": "net_total", + "oldfieldtype": "Currency", + "options": "Company:company:default_currency", + "permlevel": 0, + "print_hide": 1, + "read_only": 1, "reqd": 0 - }, + }, { - "fieldname": "column_break_24", - "fieldtype": "Column Break", + "fieldname": "column_break_24", + "fieldtype": "Column Break", "permlevel": 0 - }, + }, { - "fieldname": "net_total_import", - "fieldtype": "Currency", - "label": "Net Total", - "no_copy": 0, - "oldfieldname": "net_total_import", - "oldfieldtype": "Currency", - "options": "currency", - "permlevel": 0, - "print_hide": 0, + "fieldname": "net_total_import", + "fieldtype": "Currency", + "label": "Net Total", + "no_copy": 0, + "oldfieldname": "net_total_import", + "oldfieldtype": "Currency", + "options": "currency", + "permlevel": 0, + "print_hide": 0, "read_only": 1 - }, + }, { - "fieldname": "taxes_section", - "fieldtype": "Section Break", - "label": "Taxes and Charges", - "oldfieldtype": "Section Break", - "options": "icon-money", + "fieldname": "taxes_section", + "fieldtype": "Section Break", + "label": "Taxes and Charges", + "oldfieldtype": "Section Break", + "options": "icon-money", "permlevel": 0 - }, + }, { - "description": "If you have created a standard template in Purchase Taxes and Charges Master, select one and click on the button below.", - "fieldname": "taxes_and_charges", - "fieldtype": "Link", - "label": "Taxes and Charges", - "no_copy": 1, - "oldfieldname": "purchase_other_charges", - "oldfieldtype": "Link", - "options": "Purchase Taxes and Charges Master", - "permlevel": 0, + "description": "If you have created a standard template in Purchase Taxes and Charges Master, select one and click on the button below.", + "fieldname": "taxes_and_charges", + "fieldtype": "Link", + "label": "Taxes and Charges", + "no_copy": 1, + "oldfieldname": "purchase_other_charges", + "oldfieldtype": "Link", + "options": "Purchase Taxes and Charges Master", + "permlevel": 0, "print_hide": 1 - }, + }, { - "fieldname": "taxes", - "fieldtype": "Table", - "label": "Purchase Taxes and Charges", - "no_copy": 0, - "oldfieldname": "purchase_tax_details", - "oldfieldtype": "Table", - "options": "Purchase Taxes and Charges", + "fieldname": "taxes", + "fieldtype": "Table", + "label": "Purchase Taxes and Charges", + "no_copy": 0, + "oldfieldname": "purchase_tax_details", + "oldfieldtype": "Table", + "options": "Purchase Taxes and Charges", "permlevel": 0 - }, + }, { - "fieldname": "other_charges_calculation", - "fieldtype": "HTML", - "label": "Taxes and Charges Calculation", - "no_copy": 1, - "oldfieldtype": "HTML", - "permlevel": 0, + "fieldname": "other_charges_calculation", + "fieldtype": "HTML", + "label": "Taxes and Charges Calculation", + "no_copy": 1, + "oldfieldtype": "HTML", + "permlevel": 0, "print_hide": 1 - }, + }, { - "fieldname": "totals", - "fieldtype": "Section Break", - "label": "Totals", - "oldfieldtype": "Section Break", - "options": "icon-money", + "fieldname": "totals", + "fieldtype": "Section Break", + "label": "Totals", + "oldfieldtype": "Section Break", + "options": "icon-money", "permlevel": 0 - }, + }, { - "fieldname": "other_charges_added", - "fieldtype": "Currency", - "label": "Taxes and Charges Added (Company Currency)", - "no_copy": 0, - "oldfieldname": "other_charges_added", - "oldfieldtype": "Currency", - "options": "Company:company:default_currency", - "permlevel": 0, - "print_hide": 1, + "fieldname": "other_charges_added", + "fieldtype": "Currency", + "label": "Taxes and Charges Added (Company Currency)", + "no_copy": 0, + "oldfieldname": "other_charges_added", + "oldfieldtype": "Currency", + "options": "Company:company:default_currency", + "permlevel": 0, + "print_hide": 1, "read_only": 1 - }, + }, { - "fieldname": "other_charges_deducted", - "fieldtype": "Currency", - "label": "Taxes and Charges Deducted (Company Currency)", - "no_copy": 0, - "oldfieldname": "other_charges_deducted", - "oldfieldtype": "Currency", - "options": "Company:company:default_currency", - "permlevel": 0, - "print_hide": 1, + "fieldname": "other_charges_deducted", + "fieldtype": "Currency", + "label": "Taxes and Charges Deducted (Company Currency)", + "no_copy": 0, + "oldfieldname": "other_charges_deducted", + "oldfieldtype": "Currency", + "options": "Company:company:default_currency", + "permlevel": 0, + "print_hide": 1, "read_only": 1 - }, + }, { - "fieldname": "total_tax", - "fieldtype": "Currency", - "label": "Total Tax (Company Currency)", - "no_copy": 1, - "oldfieldname": "total_tax", - "oldfieldtype": "Currency", - "options": "Company:company:default_currency", - "permlevel": 0, - "print_hide": 1, + "fieldname": "total_tax", + "fieldtype": "Currency", + "label": "Total Tax (Company Currency)", + "no_copy": 1, + "oldfieldname": "total_tax", + "oldfieldtype": "Currency", + "options": "Company:company:default_currency", + "permlevel": 0, + "print_hide": 1, "read_only": 1 - }, + }, { - "fieldname": "grand_total", - "fieldtype": "Currency", - "label": "Grand Total (Company Currency)", - "no_copy": 1, - "oldfieldname": "grand_total", - "oldfieldtype": "Currency", - "options": "Company:company:default_currency", - "permlevel": 0, - "print_hide": 1, + "fieldname": "grand_total", + "fieldtype": "Currency", + "label": "Grand Total (Company Currency)", + "no_copy": 1, + "oldfieldname": "grand_total", + "oldfieldtype": "Currency", + "options": "Company:company:default_currency", + "permlevel": 0, + "print_hide": 1, "read_only": 1 - }, + }, { - "fieldname": "rounded_total", - "fieldtype": "Currency", - "label": "Rounded Total (Company Currency)", - "oldfieldname": "rounded_total", - "oldfieldtype": "Currency", - "options": "Company:company:default_currency", - "permlevel": 0, - "print_hide": 1, + "fieldname": "rounded_total", + "fieldtype": "Currency", + "label": "Rounded Total (Company Currency)", + "oldfieldname": "rounded_total", + "oldfieldtype": "Currency", + "options": "Company:company:default_currency", + "permlevel": 0, + "print_hide": 1, "read_only": 1 - }, + }, { - "description": "In Words will be visible once you save the Purchase Order.", - "fieldname": "in_words", - "fieldtype": "Data", - "label": "In Words (Company Currency)", - "oldfieldname": "in_words", - "oldfieldtype": "Data", - "permlevel": 0, - "print_hide": 1, + "description": "In Words will be visible once you save the Purchase Order.", + "fieldname": "in_words", + "fieldtype": "Data", + "label": "In Words (Company Currency)", + "oldfieldname": "in_words", + "oldfieldtype": "Data", + "permlevel": 0, + "print_hide": 1, "read_only": 1 - }, + }, { - "fieldname": "column_break4", - "fieldtype": "Column Break", - "oldfieldtype": "Column Break", - "permlevel": 0, + "fieldname": "column_break4", + "fieldtype": "Column Break", + "oldfieldtype": "Column Break", + "permlevel": 0, "print_hide": 0 - }, + }, { - "fieldname": "other_charges_added_import", - "fieldtype": "Currency", - "label": "Taxes and Charges Added", - "no_copy": 0, - "oldfieldname": "other_charges_added_import", - "oldfieldtype": "Currency", - "options": "currency", - "permlevel": 0, - "print_hide": 1, - "read_only": 1, + "fieldname": "other_charges_added_import", + "fieldtype": "Currency", + "label": "Taxes and Charges Added", + "no_copy": 0, + "oldfieldname": "other_charges_added_import", + "oldfieldtype": "Currency", + "options": "currency", + "permlevel": 0, + "print_hide": 1, + "read_only": 1, "report_hide": 0 - }, + }, { - "fieldname": "other_charges_deducted_import", - "fieldtype": "Currency", - "label": "Taxes and Charges Deducted", - "no_copy": 0, - "oldfieldname": "other_charges_deducted_import", - "oldfieldtype": "Currency", - "options": "currency", - "permlevel": 0, - "print_hide": 1, - "read_only": 1, + "fieldname": "other_charges_deducted_import", + "fieldtype": "Currency", + "label": "Taxes and Charges Deducted", + "no_copy": 0, + "oldfieldname": "other_charges_deducted_import", + "oldfieldtype": "Currency", + "options": "currency", + "permlevel": 0, + "print_hide": 1, + "read_only": 1, "report_hide": 0 - }, + }, { - "fieldname": "grand_total_import", - "fieldtype": "Currency", - "in_list_view": 1, - "label": "Grand Total", - "no_copy": 0, - "oldfieldname": "grand_total_import", - "oldfieldtype": "Currency", - "options": "currency", - "permlevel": 0, - "print_hide": 0, - "read_only": 1, + "fieldname": "grand_total_import", + "fieldtype": "Currency", + "in_list_view": 1, + "label": "Grand Total", + "no_copy": 0, + "oldfieldname": "grand_total_import", + "oldfieldtype": "Currency", + "options": "currency", + "permlevel": 0, + "print_hide": 0, + "read_only": 1, "report_hide": 0 - }, + }, { - "fieldname": "in_words_import", - "fieldtype": "Data", - "label": "In Words", - "oldfieldname": "in_words_import", - "oldfieldtype": "Data", - "permlevel": 0, - "print_hide": 0, + "fieldname": "in_words_import", + "fieldtype": "Data", + "label": "In Words", + "oldfieldname": "in_words_import", + "oldfieldtype": "Data", + "permlevel": 0, + "print_hide": 0, "read_only": 1 - }, + }, { - "fieldname": "fold", - "fieldtype": "Fold", + "fieldname": "fold", + "fieldtype": "Fold", "permlevel": 0 - }, + }, { - "fieldname": "terms_section_break", - "fieldtype": "Section Break", - "label": "Terms and Conditions", - "oldfieldtype": "Section Break", - "options": "icon-legal", + "fieldname": "terms_section_break", + "fieldtype": "Section Break", + "label": "Terms and Conditions", + "oldfieldtype": "Section Break", + "options": "icon-legal", "permlevel": 0 - }, + }, { - "allow_on_submit": 1, - "fieldname": "letter_head", - "fieldtype": "Link", - "label": "Letter Head", - "oldfieldname": "letter_head", - "oldfieldtype": "Select", - "options": "Letter Head", - "permlevel": 0, + "allow_on_submit": 1, + "fieldname": "letter_head", + "fieldtype": "Link", + "label": "Letter Head", + "oldfieldname": "letter_head", + "oldfieldtype": "Select", + "options": "Letter Head", + "permlevel": 0, "print_hide": 1 - }, + }, { - "fieldname": "tc_name", - "fieldtype": "Link", - "label": "Terms", - "oldfieldname": "tc_name", - "oldfieldtype": "Link", - "options": "Terms and Conditions", - "permlevel": 0, + "fieldname": "tc_name", + "fieldtype": "Link", + "label": "Terms", + "oldfieldname": "tc_name", + "oldfieldtype": "Link", + "options": "Terms and Conditions", + "permlevel": 0, "print_hide": 1 - }, + }, { - "fieldname": "get_terms", - "fieldtype": "Button", - "label": "Get Terms and Conditions", - "oldfieldtype": "Button", + "fieldname": "get_terms", + "fieldtype": "Button", + "label": "Get Terms and Conditions", + "oldfieldtype": "Button", "permlevel": 0 - }, + }, { - "fieldname": "terms", - "fieldtype": "Text Editor", - "label": "Terms and Conditions", - "oldfieldname": "terms", - "oldfieldtype": "Text Editor", + "fieldname": "terms", + "fieldtype": "Text Editor", + "label": "Terms and Conditions", + "oldfieldname": "terms", + "oldfieldtype": "Text Editor", "permlevel": 0 - }, + }, { - "depends_on": "supplier", - "fieldname": "contact_section", - "fieldtype": "Section Break", - "label": "Contact Info", - "options": "icon-bullhorn", + "depends_on": "supplier", + "fieldname": "contact_section", + "fieldtype": "Section Break", + "label": "Contact Info", + "options": "icon-bullhorn", "permlevel": 0 - }, + }, { - "fieldname": "supplier_address", - "fieldtype": "Link", - "in_filter": 1, - "label": "Supplier Address", - "options": "Address", - "permlevel": 0, + "fieldname": "supplier_address", + "fieldtype": "Link", + "in_filter": 1, + "label": "Supplier Address", + "options": "Address", + "permlevel": 0, "print_hide": 1 - }, + }, { - "fieldname": "contact_person", - "fieldtype": "Link", - "in_filter": 1, - "label": "Contact Person", - "options": "Contact", - "permlevel": 0, + "fieldname": "contact_person", + "fieldtype": "Link", + "in_filter": 1, + "label": "Contact Person", + "options": "Contact", + "permlevel": 0, "print_hide": 1 - }, + }, { - "fieldname": "more_info", - "fieldtype": "Section Break", - "label": "More Info", - "oldfieldtype": "Section Break", - "options": "icon-file-text", + "fieldname": "more_info", + "fieldtype": "Section Break", + "label": "More Info", + "oldfieldtype": "Section Break", + "options": "icon-file-text", "permlevel": 0 - }, + }, { - "fieldname": "status", - "fieldtype": "Select", - "in_filter": 1, - "label": "Status", - "no_copy": 1, - "oldfieldname": "status", - "oldfieldtype": "Select", - "options": "\nDraft\nSubmitted\nStopped\nCancelled", - "permlevel": 0, - "print_hide": 1, - "read_only": 1, - "reqd": 1, + "fieldname": "status", + "fieldtype": "Select", + "in_filter": 1, + "label": "Status", + "no_copy": 1, + "oldfieldname": "status", + "oldfieldtype": "Select", + "options": "\nDraft\nSubmitted\nStopped\nCancelled", + "permlevel": 0, + "print_hide": 1, + "read_only": 1, + "reqd": 1, "search_index": 1 - }, + }, { - "default": "No", - "fieldname": "is_subcontracted", - "fieldtype": "Select", - "label": "Is Subcontracted", - "options": "\nYes\nNo", - "permlevel": 0, + "default": "No", + "fieldname": "is_subcontracted", + "fieldtype": "Select", + "label": "Is Subcontracted", + "options": "\nYes\nNo", + "permlevel": 0, "print_hide": 1 - }, + }, { - "fieldname": "column_break_57", - "fieldtype": "Column Break", + "fieldname": "column_break_57", + "fieldtype": "Column Break", "permlevel": 0 - }, + }, { - "fieldname": "fiscal_year", - "fieldtype": "Link", - "in_filter": 1, - "label": "Fiscal Year", - "no_copy": 0, - "oldfieldname": "fiscal_year", - "oldfieldtype": "Select", - "options": "Fiscal Year", - "permlevel": 0, - "print_hide": 1, - "reqd": 1, + "fieldname": "fiscal_year", + "fieldtype": "Link", + "in_filter": 1, + "label": "Fiscal Year", + "no_copy": 0, + "oldfieldname": "fiscal_year", + "oldfieldtype": "Select", + "options": "Fiscal Year", + "permlevel": 0, + "print_hide": 1, + "reqd": 1, "search_index": 1 - }, + }, { - "allow_on_submit": 1, - "fieldname": "select_print_heading", - "fieldtype": "Link", - "label": "Print Heading", - "no_copy": 1, - "oldfieldname": "select_print_heading", - "oldfieldtype": "Link", - "options": "Print Heading", - "permlevel": 0, - "print_hide": 1, + "allow_on_submit": 1, + "fieldname": "select_print_heading", + "fieldtype": "Link", + "label": "Print Heading", + "no_copy": 1, + "oldfieldname": "select_print_heading", + "oldfieldtype": "Link", + "options": "Print Heading", + "permlevel": 0, + "print_hide": 1, "report_hide": 1 } - ], - "icon": "icon-shopping-cart", - "idx": 1, - "is_submittable": 1, - "modified": "2014-12-24 14:28:56.009809", - "modified_by": "Administrator", - "module": "Buying", - "name": "Supplier Quotation", - "owner": "Administrator", + ], + "icon": "icon-shopping-cart", + "idx": 1, + "is_submittable": 1, + "modified": "2015-01-07 10:34:25.299110", + "modified_by": "Administrator", + "module": "Buying", + "name": "Supplier Quotation", + "owner": "Administrator", "permissions": [ { - "amend": 1, - "cancel": 1, - "create": 1, - "delete": 1, - "email": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Manufacturing Manager", - "submit": 1, + "amend": 1, + "cancel": 1, + "create": 1, + "delete": 1, + "email": 1, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Manufacturing Manager", + "submit": 1, "write": 1 - }, + }, { - "amend": 1, - "cancel": 1, - "create": 1, - "delete": 1, - "email": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Purchase Manager", - "submit": 1, + "amend": 1, + "cancel": 1, + "create": 1, + "delete": 1, + "email": 1, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Purchase Manager", + "submit": 1, "write": 1 - }, + }, { - "amend": 1, - "apply_user_permissions": 1, - "cancel": 0, - "create": 1, - "delete": 0, - "email": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Purchase User", - "submit": 0, + "amend": 1, + "apply_user_permissions": 1, + "cancel": 0, + "create": 1, + "delete": 0, + "email": 1, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Purchase User", + "submit": 0, "write": 1 - }, + }, { - "amend": 0, - "apply_user_permissions": 1, - "cancel": 0, - "create": 0, - "delete": 0, - "email": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Material User", - "submit": 0, + "amend": 0, + "apply_user_permissions": 1, + "cancel": 0, + "create": 0, + "delete": 0, + "email": 1, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Material User", + "submit": 0, "write": 0 - }, + }, { - "amend": 0, - "apply_user_permissions": 1, - "cancel": 0, - "create": 0, - "delete": 0, - "email": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Supplier", - "submit": 0, + "amend": 0, + "apply_user_permissions": 1, + "cancel": 0, + "create": 0, + "delete": 0, + "email": 1, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Supplier", + "submit": 0, "write": 0 - }, + }, { - "permlevel": 1, - "read": 1, - "role": "Purchase Manager", + "permlevel": 1, + "read": 1, + "role": "Purchase Manager", "write": 1 } - ], - "read_only_onload": 1, - "search_fields": "status, transaction_date, supplier,grand_total", - "sort_field": "modified", - "sort_order": "DESC" -} + ], + "read_only_onload": 1, + "search_fields": "status, transaction_date, supplier,grand_total", + "sort_field": "modified", + "sort_order": "DESC", + "title_field": "supplier_name" +} \ No newline at end of file diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.html b/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.html deleted file mode 100644 index 9aa9d5bef9..0000000000 --- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.html +++ /dev/null @@ -1,22 +0,0 @@ -
-
-
- {%= list.get_avatar_and_id(doc) %} - - - {%= doc.supplier %} - - - {%= doc.status %} -
-
-
-
- {%= doc.get_formatted("grand_total_import") %} -
-
-
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js b/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js index d62a0e2435..400a820bcc 100644 --- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js +++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js @@ -1,3 +1,10 @@ frappe.listview_settings['Supplier Quotation'] = { - add_fields: ["supplier", "grand_total", "status", "company", "currency"] + add_fields: ["supplier", "grand_total", "status", "company", "currency"], + get_indicator: function(doc) { + if(doc.status==="Ordered") { + return [__("Ordered"), "green", "status,=,Ordered"]; + } else if(doc.status==="Rejected") { + return [__("Lost"), "darkgrey", "status,=,Lost"]; + } + } }; diff --git a/erpnext/hr/doctype/appraisal/appraisal.json b/erpnext/hr/doctype/appraisal/appraisal.json index 957b1afed1..bb239ac773 100644 --- a/erpnext/hr/doctype/appraisal/appraisal.json +++ b/erpnext/hr/doctype/appraisal/appraisal.json @@ -41,7 +41,7 @@ "fieldname": "employee_name", "fieldtype": "Data", "in_filter": 1, - "in_list_view": 1, + "in_list_view": 0, "label": "For Employee Name", "oldfieldname": "employee_name", "oldfieldtype": "Data", @@ -62,7 +62,7 @@ "fieldname": "status", "fieldtype": "Select", "in_filter": 1, - "in_list_view": 1, + "in_list_view": 0, "label": "Status", "no_copy": 1, "oldfieldname": "status", @@ -197,7 +197,7 @@ "icon": "icon-thumbs-up", "idx": 1, "is_submittable": 1, - "modified": "2014-12-24 15:00:49.133185", + "modified": "2015-01-07 14:51:15.943276", "modified_by": "Administrator", "module": "HR", "name": "Appraisal", @@ -249,5 +249,6 @@ ], "search_fields": "status, employee, employee_name", "sort_field": "modified", - "sort_order": "DESC" + "sort_order": "DESC", + "title_field": "employee_name" } \ No newline at end of file diff --git a/erpnext/hr/doctype/attendance/attendance.json b/erpnext/hr/doctype/attendance/attendance.json index 18c39e0c63..41ef499d3b 100644 --- a/erpnext/hr/doctype/attendance/attendance.json +++ b/erpnext/hr/doctype/attendance/attendance.json @@ -40,7 +40,7 @@ { "fieldname": "employee_name", "fieldtype": "Data", - "in_list_view": 1, + "in_list_view": 0, "label": "Employee Name", "oldfieldname": "employee_name", "oldfieldtype": "Data", @@ -51,7 +51,7 @@ "fieldname": "status", "fieldtype": "Select", "in_filter": 1, - "in_list_view": 1, + "in_list_view": 0, "label": "Status", "no_copy": 1, "oldfieldname": "status", @@ -65,7 +65,7 @@ "fieldname": "leave_type", "fieldtype": "Link", "hidden": 1, - "in_list_view": 1, + "in_list_view": 0, "label": "Leave Type", "oldfieldname": "leave_type", "oldfieldtype": "Link", @@ -85,6 +85,7 @@ "fieldname": "att_date", "fieldtype": "Date", "in_filter": 1, + "in_list_view": 1, "label": "Attendance Date", "oldfieldname": "att_date", "oldfieldtype": "Date", @@ -129,7 +130,7 @@ "icon": "icon-ok", "idx": 1, "is_submittable": 1, - "modified": "2014-08-05 06:52:02.226904", + "modified": "2015-01-07 14:45:03.326807", "modified_by": "Administrator", "module": "HR", "name": "Attendance", diff --git a/erpnext/hr/doctype/attendance/attendance_list.html b/erpnext/hr/doctype/attendance/attendance_list.html deleted file mode 100644 index bfda7f88e9..0000000000 --- a/erpnext/hr/doctype/attendance/attendance_list.html +++ /dev/null @@ -1,19 +0,0 @@ -
-
-
- {%= list.get_avatar_and_id(doc) %} - - - {%= doc.status %} - -
-
-
- - {%= doc.get_formatted("att_date") %} -
-
diff --git a/erpnext/hr/doctype/attendance/attendance_list.js b/erpnext/hr/doctype/attendance/attendance_list.js index 87c87d76d3..05353e2be8 100644 --- a/erpnext/hr/doctype/attendance/attendance_list.js +++ b/erpnext/hr/doctype/attendance/attendance_list.js @@ -1,3 +1,6 @@ frappe.listview_settings['Attendance'] = { add_fields: ["status", "att_date"], + get_indicator: function(doc) { + return [__(doc.status), doc.status=="Present" ? "green" : "darkgrey", "status,=," + doc.status]; + } }; diff --git a/erpnext/hr/doctype/employee/employee.json b/erpnext/hr/doctype/employee/employee.json index 61d6dc361b..0bcd7df0ea 100644 --- a/erpnext/hr/doctype/employee/employee.json +++ b/erpnext/hr/doctype/employee/employee.json @@ -160,7 +160,7 @@ "fieldname": "status", "fieldtype": "Select", "in_filter": 1, - "in_list_view": 1, + "in_list_view": 0, "label": "Status", "oldfieldname": "status", "oldfieldtype": "Select", @@ -174,7 +174,7 @@ "fieldtype": "Link", "ignore_user_permissions": 1, "in_filter": 1, - "in_list_view": 1, + "in_list_view": 0, "label": "Employment Type", "oldfieldname": "employment_type", "oldfieldtype": "Link", @@ -273,6 +273,7 @@ "fieldname": "designation", "fieldtype": "Link", "in_filter": 1, + "in_list_view": 1, "label": "Designation", "oldfieldname": "designation", "oldfieldtype": "Link", @@ -673,7 +674,7 @@ ], "icon": "icon-user", "idx": 1, - "modified": "2014-12-26 11:12:57.631617", + "modified": "2015-01-07 14:37:39.988374", "modified_by": "Administrator", "module": "HR", "name": "Employee", diff --git a/erpnext/hr/doctype/employee/employee_list.html b/erpnext/hr/doctype/employee/employee_list.html deleted file mode 100644 index 98b45a9c34..0000000000 --- a/erpnext/hr/doctype/employee/employee_list.html +++ /dev/null @@ -1,35 +0,0 @@ -
-
-
- {%= list.get_avatar_and_id(doc) %} - - {% if(doc.status==="Active") { %} - - - - {% } %} - - {% if(doc.designation) { %} - - {%= doc.designation %} - {% } %} - - {% if(doc.branch) { %} - - {%= doc.branch %} - - {% } %} - - {% if(doc.department) { %} - - {%= doc.department %} - - {% } %} -
-
-
diff --git a/erpnext/hr/doctype/employee/employee_list.js b/erpnext/hr/doctype/employee/employee_list.js index c1b23ac43a..697900c31d 100644 --- a/erpnext/hr/doctype/employee/employee_list.js +++ b/erpnext/hr/doctype/employee/employee_list.js @@ -1,4 +1,9 @@ frappe.listview_settings['Employee'] = { add_fields: ["status", "branch", "department", "designation"], - filters:[["status","=", "Active"]] + filters: [["status","=", "Active"]], + get_indicator: function(doc) { + var indicator = [__(doc.status), frappe.utils.guess_colour(doc.status), "status,=," + doc.status]; + indicator[1] = {"Active": "green", "Left": "darkgrey"}[doc.status]; + return indicator; + } }; diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.js b/erpnext/hr/doctype/expense_claim/expense_claim.js index 487a402c91..c394355d1f 100644 --- a/erpnext/hr/doctype/expense_claim/expense_claim.js +++ b/erpnext/hr/doctype/expense_claim/expense_claim.js @@ -88,7 +88,7 @@ cur_frm.cscript.refresh = function(doc,cdt,cdn){ if(doc.docstatus==0 && doc.exp_approver==user && doc.approval_status=="Approved") cur_frm.savesubmit(); - if(doc.docstatus==1 && frappe.model.can_create("Journal Entry") && + if(doc.docstatus==1 && frappe.model.can_create("Journal Entry") && cint(doc.total_amount_reimbursed) < cint(doc.total_sanctioned_amount)) cur_frm.add_custom_button(__("Make Bank Entry"), cur_frm.cscript.make_bank_entry, frappe.boot.doctype_icons["Journal Entry"]); @@ -106,15 +106,6 @@ cur_frm.cscript.set_help = function(doc) { } else { cur_frm.set_intro(__("Expense Claim is pending approval. Only the Expense Approver can update status.")); } - } else { - if(doc.approval_status=="Approved") { - cur_frm.set_intro(__("Expense Claim has been approved.")); - if(Math.abs(cint(doc.total_amount_reimbursed) - cint(doc.total_sanctioned_amount)) < .001){ - cur_frm.set_intro(__("Expense Claim has been reimbursed.")); - } - } else if(doc.approval_status=="Rejected") { - cur_frm.set_intro(__("Expense Claim has been rejected.")); - } } } } diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.json b/erpnext/hr/doctype/expense_claim/expense_claim.json index c952fb176d..0c86601431 100644 --- a/erpnext/hr/doctype/expense_claim/expense_claim.json +++ b/erpnext/hr/doctype/expense_claim/expense_claim.json @@ -22,7 +22,7 @@ "fieldname": "approval_status", "fieldtype": "Select", "in_filter": 1, - "in_list_view": 1, + "in_list_view": 0, "label": "Approval Status", "no_copy": 1, "oldfieldname": "approval_status", @@ -68,7 +68,7 @@ "fieldname": "total_sanctioned_amount", "fieldtype": "Currency", "in_filter": 0, - "in_list_view": 1, + "in_list_view": 0, "label": "Total Sanctioned Amount", "no_copy": 1, "oldfieldname": "total_sanctioned_amount", @@ -127,7 +127,7 @@ "fieldname": "employee_name", "fieldtype": "Data", "in_filter": 1, - "in_list_view": 1, + "in_list_view": 0, "label": "Employee Name", "oldfieldname": "employee_name", "oldfieldtype": "Data", @@ -202,7 +202,7 @@ "icon": "icon-money", "idx": 1, "is_submittable": 1, - "modified": "2014-12-24 15:31:39.611197", + "modified": "2015-01-07 11:31:12.783147", "modified_by": "Administrator", "module": "HR", "name": "Expense Claim", @@ -220,6 +220,24 @@ "role": "Employee", "write": 1 }, + { + "amend": 1, + "apply_user_permissions": 0, + "cancel": 1, + "create": 1, + "delete": 1, + "email": 0, + "export": 0, + "import": 0, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "HR Manager", + "set_user_permissions": 0, + "submit": 1, + "write": 1 + }, { "amend": 1, "apply_user_permissions": 1, @@ -253,5 +271,6 @@ ], "search_fields": "approval_status,employee,employee_name", "sort_field": "modified", - "sort_order": "DESC" + "sort_order": "DESC", + "title_field": "employee_name" } \ No newline at end of file diff --git a/erpnext/hr/doctype/expense_claim/expense_claim_list.html b/erpnext/hr/doctype/expense_claim/expense_claim_list.html deleted file mode 100644 index 944d34c452..0000000000 --- a/erpnext/hr/doctype/expense_claim/expense_claim_list.html +++ /dev/null @@ -1,28 +0,0 @@ -
-
-
- {%= list.get_avatar_and_id(doc) %} - - - {%= doc.employee_name %} - - - {%= doc.approval_status %} - - - {% if(doc.total_amount_reimbursed== doc.total_sanctioned_amount && doc.docstatus== 1) { %} - - "Reimbursed" - - {% } %} -
-
- -
- {%= doc.get_formatted("total_claimed_amount") %} -
-
diff --git a/erpnext/hr/doctype/expense_claim/expense_claim_list.js b/erpnext/hr/doctype/expense_claim/expense_claim_list.js index 818296de8c..54073edef5 100644 --- a/erpnext/hr/doctype/expense_claim/expense_claim_list.js +++ b/erpnext/hr/doctype/expense_claim/expense_claim_list.js @@ -1,5 +1,8 @@ frappe.listview_settings['Expense Claim'] = { - add_fields: ["approval_status", "employee", "employee_name", - "total_claimed_amount", "total_amount_reimbursed", "total_sanctioned_amount", "docstatus"], - filters:[["approval_status","!=", "Rejected"]] + add_fields: ["approval_status", "total_claimed_amount", "docstatus"], + filters:[["approval_status","!=", "Rejected"]], + get_indicator: function(doc) { + return [__(doc.approval_status), frappe.utils.guess_colour(doc.approval_status), + "approval_status,=," + doc.approval_status]; + } }; diff --git a/erpnext/hr/doctype/job_applicant/job_applicant.json b/erpnext/hr/doctype/job_applicant/job_applicant.json index 188c88b2e3..822cd2ad85 100644 --- a/erpnext/hr/doctype/job_applicant/job_applicant.json +++ b/erpnext/hr/doctype/job_applicant/job_applicant.json @@ -1,5 +1,5 @@ { - "autoname": "field:applicant_name", + "autoname": "field:applicant_name", "creation": "2013-01-29 19:25:37", "description": "Applicant for a Job", "docstatus": 0, @@ -9,7 +9,7 @@ { "fieldname": "applicant_name", "fieldtype": "Data", - "in_list_view": 1, + "in_list_view": 0, "label": "Applicant Name", "permlevel": 0, "reqd": 1 @@ -65,7 +65,7 @@ ], "icon": "icon-user", "idx": 1, - "modified": "2014-05-27 03:49:12.168814", + "modified": "2015-01-07 14:52:03.446405", "modified_by": "Administrator", "module": "HR", "name": "Job Applicant", diff --git a/erpnext/hr/doctype/leave_application/leave_application.js b/erpnext/hr/doctype/leave_application/leave_application.js index 8613a8f6d9..e01f738d75 100755 --- a/erpnext/hr/doctype/leave_application/leave_application.js +++ b/erpnext/hr/doctype/leave_application/leave_application.js @@ -36,15 +36,6 @@ cur_frm.cscript.refresh = function(doc, dt, dn) { cur_frm.set_intro(__("This Leave Application is pending approval. Only the Leave Apporver can update status.")) cur_frm.toggle_enable("status", false); } - } else { - if(doc.status=="Approved") { - cur_frm.set_intro(__("Leave application has been approved.")); - if(cur_frm.doc.docstatus==0) { - cur_frm.set_intro(__("Please submit to update Leave Balance.")); - } - } else if(doc.status=="Rejected") { - cur_frm.set_intro(__("Leave application has been rejected.")); - } } } } diff --git a/erpnext/hr/doctype/leave_application/leave_application.json b/erpnext/hr/doctype/leave_application/leave_application.json index 8beed8b028..91e96b8b65 100644 --- a/erpnext/hr/doctype/leave_application/leave_application.json +++ b/erpnext/hr/doctype/leave_application/leave_application.json @@ -10,7 +10,7 @@ "default": "Open", "fieldname": "status", "fieldtype": "Select", - "in_list_view": 1, + "in_list_view": 0, "label": "Status", "no_copy": 1, "options": "Open\nApproved\nRejected", @@ -36,7 +36,7 @@ "fieldtype": "Link", "ignore_user_permissions": 1, "in_filter": 1, - "in_list_view": 1, + "in_list_view": 0, "label": "Leave Type", "options": "Leave Type", "permlevel": 0, @@ -94,7 +94,7 @@ "fieldname": "employee_name", "fieldtype": "Data", "in_filter": 1, - "in_list_view": 1, + "in_list_view": 0, "label": "Employee Name", "permlevel": 0, "read_only": 1, @@ -111,6 +111,7 @@ { "fieldname": "total_leave_days", "fieldtype": "Float", + "in_list_view": 1, "label": "Total Leave Days", "no_copy": 1, "permlevel": 0, @@ -191,7 +192,7 @@ "idx": 1, "is_submittable": 1, "max_attachments": 3, - "modified": "2014-12-09 16:33:29.626849", + "modified": "2015-01-07 14:40:16.244403", "modified_by": "Administrator", "module": "HR", "name": "Leave Application", @@ -298,5 +299,6 @@ ], "search_fields": "employee,employee_name,leave_type,from_date,to_date,total_leave_days,fiscal_year", "sort_field": "modified", - "sort_order": "DESC" + "sort_order": "DESC", + "title_field": "employee_name" } \ No newline at end of file diff --git a/erpnext/hr/doctype/leave_application/leave_application_list.html b/erpnext/hr/doctype/leave_application/leave_application_list.html deleted file mode 100644 index dfae4365b5..0000000000 --- a/erpnext/hr/doctype/leave_application/leave_application_list.html +++ /dev/null @@ -1,28 +0,0 @@ -
-
-
- {%= list.get_avatar_and_id(doc) %} - - - {%= doc.employee_name %} - - - {%= __("{0} days from {1}", - [doc.total_leave_days, doc.get_formatted("from_date")]) %} - - - {%= doc.status %} - - - - {%= doc.leave_type %} - -
-
-
diff --git a/erpnext/hr/doctype/leave_application/leave_application_list.js b/erpnext/hr/doctype/leave_application/leave_application_list.js index e2a89013f7..e0558a7a34 100644 --- a/erpnext/hr/doctype/leave_application/leave_application_list.js +++ b/erpnext/hr/doctype/leave_application/leave_application_list.js @@ -1,4 +1,8 @@ frappe.listview_settings['Leave Application'] = { add_fields: ["status", "leave_type", "employee", "employee_name", "total_leave_days", "from_date"], - filters:[["status","!=", "Rejected"], ["to_date", ">=", frappe.datetime.get_today()]] + filters:[["status","!=", "Rejected"], ["to_date", ">=", frappe.datetime.get_today()]], + get_indicator: function(doc) { + return [__(doc.status), frappe.utils.guess_colour(doc.status), + "status,=," + doc.status]; + } }; diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.json b/erpnext/hr/doctype/salary_slip/salary_slip.json index a90b3e4d1b..fe4c86ac53 100644 --- a/erpnext/hr/doctype/salary_slip/salary_slip.json +++ b/erpnext/hr/doctype/salary_slip/salary_slip.json @@ -26,7 +26,7 @@ "fieldname": "employee_name", "fieldtype": "Data", "in_filter": 1, - "in_list_view": 1, + "in_list_view": 0, "label": "Employee Name", "oldfieldname": "employee_name", "oldfieldtype": "Data", @@ -81,19 +81,6 @@ "permlevel": 0, "print_hide": 1 }, - { - "fieldname": "fiscal_year", - "fieldtype": "Link", - "in_filter": 1, - "in_list_view": 1, - "label": "Fiscal Year", - "oldfieldname": "fiscal_year", - "oldfieldtype": "Data", - "options": "Fiscal Year", - "permlevel": 0, - "reqd": 1, - "search_index": 0 - }, { "fieldname": "company", "fieldtype": "Link", @@ -124,6 +111,19 @@ "search_index": 1, "width": "37%" }, + { + "fieldname": "fiscal_year", + "fieldtype": "Link", + "in_filter": 1, + "in_list_view": 1, + "label": "Fiscal Year", + "oldfieldname": "fiscal_year", + "oldfieldtype": "Data", + "options": "Fiscal Year", + "permlevel": 0, + "reqd": 1, + "search_index": 0 + }, { "fieldname": "total_days_in_month", "fieldtype": "Float", @@ -337,7 +337,7 @@ "icon": "icon-file-text", "idx": 1, "is_submittable": 1, - "modified": "2014-12-24 16:38:43.899286", + "modified": "2015-01-07 14:49:28.835615", "modified_by": "Administrator", "module": "HR", "name": "Salary Slip", @@ -380,5 +380,6 @@ } ], "sort_field": "modified", - "sort_order": "DESC" + "sort_order": "DESC", + "title_field": "employee_name" } \ No newline at end of file diff --git a/erpnext/hr/doctype/salary_slip/salary_slip_list.html b/erpnext/hr/doctype/salary_slip/salary_slip_list.html deleted file mode 100644 index ef54450ef0..0000000000 --- a/erpnext/hr/doctype/salary_slip/salary_slip_list.html +++ /dev/null @@ -1,26 +0,0 @@ -
-
-
- {%= list.get_avatar_and_id(doc) %} - - - - {%= doc.employee_name %} - -
-
-
- - {%= doc.month %} - - - - {%= doc.fiscal_year %} - -
-
diff --git a/erpnext/manufacturing/doctype/bom/bom.json b/erpnext/manufacturing/doctype/bom/bom.json index 97b35e09f6..7dac33ca2f 100644 --- a/erpnext/manufacturing/doctype/bom/bom.json +++ b/erpnext/manufacturing/doctype/bom/bom.json @@ -27,7 +27,7 @@ "fieldname": "is_active", "fieldtype": "Check", "hidden": 0, - "in_list_view": 1, + "in_list_view": 0, "label": "Is Active", "no_copy": 1, "oldfieldname": "is_active", @@ -40,7 +40,7 @@ "default": "1", "fieldname": "is_default", "fieldtype": "Check", - "in_list_view": 1, + "in_list_view": 0, "label": "Is Default", "no_copy": 1, "oldfieldname": "is_default", @@ -130,7 +130,7 @@ { "fieldname": "operating_cost", "fieldtype": "Currency", - "in_list_view": 1, + "in_list_view": 0, "label": "Operating Cost", "options": "Company:company:default_currency", "permlevel": 0, @@ -152,6 +152,7 @@ { "fieldname": "total_cost", "fieldtype": "Currency", + "in_list_view": 1, "label": "Total Cost", "options": "Company:company:default_currency", "permlevel": 0, @@ -208,7 +209,7 @@ { "fieldname": "description", "fieldtype": "Small Text", - "in_list_view": 1, + "in_list_view": 0, "label": "Item Desription", "permlevel": 0, "read_only": 1 @@ -244,7 +245,7 @@ "is_submittable": 1, "issingle": 0, "istable": 0, - "modified": "2014-12-24 14:38:43.906947", + "modified": "2015-01-07 11:11:07.047695", "modified_by": "Administrator", "module": "Manufacturing", "name": "BOM", diff --git a/erpnext/manufacturing/doctype/bom/bom_list.html b/erpnext/manufacturing/doctype/bom/bom_list.html deleted file mode 100644 index 8303f4a3d4..0000000000 --- a/erpnext/manufacturing/doctype/bom/bom_list.html +++ /dev/null @@ -1,20 +0,0 @@ -
-
-
- {%= list.get_avatar_and_id(doc) %} - {% if(cint(doc.is_active)) { %} - - {%= __("Active") %} - {% } %} - {% if(cint(doc.is_default)) { %} - - {%= __("Default") %} - {% } %} -
-
-
- {%= doc.get_formatted("total_cost") %} -
-
diff --git a/erpnext/manufacturing/doctype/bom/bom_list.js b/erpnext/manufacturing/doctype/bom/bom_list.js index 71d54a20dc..c73ed0d4a1 100644 --- a/erpnext/manufacturing/doctype/bom/bom_list.js +++ b/erpnext/manufacturing/doctype/bom/bom_list.js @@ -1,3 +1,12 @@ frappe.listview_settings['BOM'] = { - add_fields: ["is_active", "is_default", "total_cost"] + add_fields: ["is_active", "is_default", "total_cost"], + get_indicator: function(doc) { + if(doc.is_default) { + return [__("Default"), "green", "is_default,=,Yes"]; + } else if(doc.is_active) { + return [__("Active"), "blue", "is_active,=,Yes"]; + } else if(!doc.is_active) { + return [__("Not active"), "darkgrey", "is_active,=,No"]; + } + } }; diff --git a/erpnext/projects/doctype/activity_type/activity_type.json b/erpnext/projects/doctype/activity_type/activity_type.json index abbbbdb7b5..e4a6bc19db 100644 --- a/erpnext/projects/doctype/activity_type/activity_type.json +++ b/erpnext/projects/doctype/activity_type/activity_type.json @@ -9,7 +9,7 @@ { "fieldname": "activity_type", "fieldtype": "Data", - "in_list_view": 1, + "in_list_view": 0, "label": "Activity Type", "permlevel": 0, "reqd": 1 @@ -18,7 +18,7 @@ "icon": "icon-flag", "idx": 1, "in_dialog": 0, - "modified": "2014-05-27 03:49:07.219341", + "modified": "2015-01-07 15:12:20.500625", "modified_by": "Administrator", "module": "Projects", "name": "Activity Type", diff --git a/erpnext/projects/doctype/project/project.json b/erpnext/projects/doctype/project/project.json index 7a3899a2c7..34c1f9adf3 100644 --- a/erpnext/projects/doctype/project/project.json +++ b/erpnext/projects/doctype/project/project.json @@ -59,6 +59,7 @@ { "fieldname": "priority", "fieldtype": "Select", + "in_list_view": 0, "label": "Priority", "no_copy": 0, "oldfieldname": "priority", @@ -163,7 +164,7 @@ { "fieldname": "percent_complete", "fieldtype": "Percent", - "in_list_view": 1, + "in_list_view": 0, "label": "% Tasks Completed", "permlevel": 0, "read_only": 1 @@ -272,7 +273,7 @@ "icon": "icon-puzzle-piece", "idx": 1, "max_attachments": 4, - "modified": "2014-12-24 16:36:50.539666", + "modified": "2015-01-07 15:03:59.981848", "modified_by": "Administrator", "module": "Projects", "name": "Project", diff --git a/erpnext/projects/doctype/project/project_list.html b/erpnext/projects/doctype/project/project_list.html deleted file mode 100644 index 42af477561..0000000000 --- a/erpnext/projects/doctype/project/project_list.html +++ /dev/null @@ -1,38 +0,0 @@ -
-
-
- {%= list.get_avatar_and_id(doc) %} - - {%= doc.status %} - - - {%= doc.priority %} - - {% if(doc.status==="Open" && doc.completion_date - && frappe.datetime.get_diff(doc.completion_date) <= 0) { %} - - {%= __("Overdue") %} - - {% } else if(doc.completion_date) { %} - - {%= doc.get_formatted("completion_date") %} - - {% } %} -
-
-
- {% var completed = doc.percent_complete, title = __("% Tasks Completed") %} - {% include "templates/form_grid/includes/progress.html" %} -
-
- {% var completed = doc.percent_milestones_completed, - title = __("% Milestones Achieved") %} - {% include "templates/form_grid/includes/progress.html" %} -
-
diff --git a/erpnext/projects/doctype/project/project_list.js b/erpnext/projects/doctype/project/project_list.js index dd0ac60958..e440de8a20 100644 --- a/erpnext/projects/doctype/project/project_list.js +++ b/erpnext/projects/doctype/project/project_list.js @@ -1,5 +1,12 @@ frappe.listview_settings['Project'] = { add_fields: ["status", "priority", "is_active", "percent_complete", "percent_milestones_completed", "completion_date"], - filters:[["status","=", "Open"]] + filters:[["status","=", "Open"]], + get_indicator: function(doc) { + if(doc.status=="Open" && doc.percent_complete) { + return [__("{0}% Complete", [doc.percent_complete]), "orange", "percent_complete,>,0|status,=,Open"]; + } else { + return [__(doc.status), frappe.utils.guess_colour(doc.status), "status,=," + doc.status]; + } + } }; diff --git a/erpnext/projects/doctype/task/task.json b/erpnext/projects/doctype/task/task.json index 1830a82bd7..12f8ba8538 100644 --- a/erpnext/projects/doctype/task/task.json +++ b/erpnext/projects/doctype/task/task.json @@ -1,5 +1,5 @@ { - "allow_import": 1, + "allow_import": 1, "autoname": "TASK.#####", "creation": "2013-01-29 19:25:50", "docstatus": 0, @@ -20,7 +20,7 @@ "fieldname": "subject", "fieldtype": "Data", "in_filter": 1, - "in_list_view": 1, + "in_list_view": 0, "label": "Subject", "oldfieldname": "subject", "oldfieldtype": "Data", @@ -55,16 +55,6 @@ "print_width": "50%", "width": "50%" }, - { - "fieldname": "project", - "fieldtype": "Link", - "in_list_view": 1, - "label": "Project", - "oldfieldname": "project", - "oldfieldtype": "Link", - "options": "Project", - "permlevel": 0 - }, { "fieldname": "status", "fieldtype": "Select", @@ -76,6 +66,16 @@ "options": "Open\nWorking\nPending Review\nClosed\nCancelled", "permlevel": 0 }, + { + "fieldname": "project", + "fieldtype": "Link", + "in_list_view": 1, + "label": "Project", + "oldfieldname": "project", + "oldfieldtype": "Link", + "options": "Project", + "permlevel": 0 + }, { "fieldname": "priority", "fieldtype": "Select", @@ -217,7 +217,7 @@ "icon": "icon-check", "idx": 1, "max_attachments": 5, - "modified": "2014-05-27 03:49:20.708319", + "modified": "2015-01-07 14:57:22.370410", "modified_by": "Administrator", "module": "Projects", "name": "Task", diff --git a/erpnext/projects/doctype/task/task_list.html b/erpnext/projects/doctype/task/task_list.html deleted file mode 100644 index 0d95055b41..0000000000 --- a/erpnext/projects/doctype/task/task_list.html +++ /dev/null @@ -1,34 +0,0 @@ -
-
-
- {%= list.get_avatar_and_id(doc) %} - {% if(doc.project) { %} - - {%= doc.project %} - {% } %} - - {%= doc.status %} - - - {%= doc.priority %} - - {% if(doc.status==="Open" && doc.exp_end_date - && frappe.datetime.get_diff(doc.exp_end_date) <= 0) { %} - - {%= __("Overdue") %} - - {% } else if(doc.exp_end_date) { %} - - {%= doc.get_formatted("exp_end_date") %} - - {% } %} -
-
-
diff --git a/erpnext/projects/doctype/time_log/time_log.json b/erpnext/projects/doctype/time_log/time_log.json index 343a697b10..ebe09cf251 100644 --- a/erpnext/projects/doctype/time_log/time_log.json +++ b/erpnext/projects/doctype/time_log/time_log.json @@ -28,7 +28,7 @@ { "fieldname": "from_time", "fieldtype": "Datetime", - "in_list_view": 1, + "in_list_view": 0, "label": "From Time", "permlevel": 0, "read_only": 0, @@ -37,7 +37,7 @@ { "fieldname": "to_time", "fieldtype": "Datetime", - "in_list_view": 1, + "in_list_view": 0, "label": "To Time", "permlevel": 0, "read_only": 0, @@ -60,7 +60,7 @@ { "fieldname": "status", "fieldtype": "Select", - "in_list_view": 1, + "in_list_view": 0, "label": "Status", "options": "Draft\nSubmitted\nBatched for Billing\nBilled\nCancelled", "permlevel": 0, @@ -71,7 +71,7 @@ "depends_on": "eval:doc.time_log_for != 'Manufacturing'", "fieldname": "activity_type", "fieldtype": "Link", - "in_list_view": 1, + "in_list_view": 0, "label": "Activity Type", "options": "Activity Type", "permlevel": 0, @@ -126,7 +126,7 @@ { "fieldname": "billable", "fieldtype": "Check", - "in_list_view": 1, + "in_list_view": 0, "label": "Billable", "permlevel": 0, "read_only": 0 @@ -199,7 +199,7 @@ "icon": "icon-time", "idx": 1, "is_submittable": 1, - "modified": "2014-12-22 15:22:00.664972", + "modified": "2015-01-07 15:11:45.194002", "modified_by": "Administrator", "module": "Projects", "name": "Time Log", @@ -233,5 +233,6 @@ "submit": 1, "write": 1 } - ] + ], + "title_field": "activity_type" } \ No newline at end of file diff --git a/erpnext/projects/doctype/time_log/time_log_list.html b/erpnext/projects/doctype/time_log/time_log_list.html deleted file mode 100644 index 96b8925edb..0000000000 --- a/erpnext/projects/doctype/time_log/time_log_list.html +++ /dev/null @@ -1,39 +0,0 @@ -
-
-
- {%= list.get_avatar_and_id(doc) %} - {% if(doc.billable) { %} - - - - {% } %} - - {% if(doc.time_log_for == 'Manufacturing') { %} - - - - {% } %} - - {% if(doc.activity_type) { %} - - {%= doc.activity_type %} - {% } %} - - {% if(doc.project) { %} - - {%= doc.project %} - {% } %} - - - ({%= doc.hours + " " + __("hours") %}) - - -
-
-
diff --git a/erpnext/selling/doctype/installation_note/installation_note.json b/erpnext/selling/doctype/installation_note/installation_note.json index 5a2b762b4a..7251a670e1 100644 --- a/erpnext/selling/doctype/installation_note/installation_note.json +++ b/erpnext/selling/doctype/installation_note/installation_note.json @@ -32,7 +32,7 @@ { "fieldname": "customer", "fieldtype": "Link", - "in_list_view": 1, + "in_list_view": 0, "label": "Customer", "oldfieldname": "customer", "oldfieldtype": "Link", @@ -46,7 +46,7 @@ "depends_on": "customer", "fieldname": "customer_address", "fieldtype": "Link", - "in_list_view": 1, + "in_list_view": 0, "label": "Customer Address", "options": "Address", "permlevel": 0, @@ -209,6 +209,7 @@ { "fieldname": "remarks", "fieldtype": "Small Text", + "in_list_view": 1, "label": "Remarks", "oldfieldname": "remarks", "oldfieldtype": "Small Text", @@ -236,7 +237,7 @@ "icon": "icon-wrench", "idx": 1, "is_submittable": 1, - "modified": "2015-01-01 14:30:01.822455", + "modified": "2015-01-07 10:50:31.542246", "modified_by": "Administrator", "module": "Selling", "name": "Installation Note", @@ -270,5 +271,6 @@ } ], "sort_field": "modified", - "sort_order": "DESC" + "sort_order": "DESC", + "title_field": "customer_name" } \ No newline at end of file diff --git a/erpnext/selling/doctype/opportunity/opportunity.json b/erpnext/selling/doctype/opportunity/opportunity.json index a351c4215e..0335982821 100644 --- a/erpnext/selling/doctype/opportunity/opportunity.json +++ b/erpnext/selling/doctype/opportunity/opportunity.json @@ -29,7 +29,7 @@ { "fieldname": "enquiry_from", "fieldtype": "Select", - "in_list_view": 1, + "in_list_view": 0, "label": "Opportunity From", "oldfieldname": "enquiry_from", "oldfieldtype": "Select", @@ -46,7 +46,7 @@ "fieldtype": "Link", "hidden": 0, "in_filter": 1, - "in_list_view": 1, + "in_list_view": 0, "label": "Customer", "no_copy": 1, "oldfieldname": "customer", @@ -64,7 +64,7 @@ "fieldtype": "Link", "hidden": 0, "in_filter": 1, - "in_list_view": 1, + "in_list_view": 0, "label": "Lead", "oldfieldname": "lead", "oldfieldtype": "Link", @@ -105,7 +105,7 @@ "default": "Draft", "fieldname": "status", "fieldtype": "Select", - "in_list_view": 1, + "in_list_view": 0, "label": "Status", "no_copy": 1, "oldfieldname": "status", @@ -177,6 +177,7 @@ "fieldname": "territory", "fieldtype": "Link", "in_filter": 1, + "in_list_view": 1, "label": "Territory", "options": "Territory", "permlevel": 0, @@ -389,7 +390,7 @@ "icon": "icon-info-sign", "idx": 1, "is_submittable": 1, - "modified": "2015-01-05 12:14:59.101693", + "modified": "2015-01-07 11:00:31.557646", "modified_by": "Administrator", "module": "Selling", "name": "Opportunity", diff --git a/erpnext/selling/doctype/opportunity/opportunity_list.html b/erpnext/selling/doctype/opportunity/opportunity_list.html deleted file mode 100644 index 27566c4791..0000000000 --- a/erpnext/selling/doctype/opportunity/opportunity_list.html +++ /dev/null @@ -1,10 +0,0 @@ -
-
- {%= list.get_avatar_and_id(doc) %} -
- -
diff --git a/erpnext/selling/doctype/opportunity/opportunity_list.js b/erpnext/selling/doctype/opportunity/opportunity_list.js index 06fbe3443e..6c6c897ddb 100644 --- a/erpnext/selling/doctype/opportunity/opportunity_list.js +++ b/erpnext/selling/doctype/opportunity/opportunity_list.js @@ -1,3 +1,10 @@ frappe.listview_settings['Opportunity'] = { - add_fields: ["customer_name", "enquiry_type", "enquiry_from", "status"] + add_fields: ["customer_name", "enquiry_type", "enquiry_from", "status"], + get_indicator: function(doc) { + var indicator = [__(doc.status), frappe.utils.guess_colour(doc.status), "status,=," + doc.status]; + if(doc.status=="Quotation") { + indicator[1] = "green"; + } + return indicator; + } }; diff --git a/erpnext/stock/doctype/batch/batch.json b/erpnext/stock/doctype/batch/batch.json index 00d0e04a4d..180949d5e0 100644 --- a/erpnext/stock/doctype/batch/batch.json +++ b/erpnext/stock/doctype/batch/batch.json @@ -19,7 +19,7 @@ { "fieldname": "item", "fieldtype": "Link", - "in_list_view": 1, + "in_list_view": 0, "label": "Item", "oldfieldname": "item", "oldfieldtype": "Link", @@ -33,26 +33,10 @@ "permlevel": 0, "precision": "" }, - { - "fieldname": "start_date", - "fieldtype": "Date", - "label": "Batch Started Date", - "oldfieldname": "start_date", - "oldfieldtype": "Date", - "permlevel": 0 - }, - { - "fieldname": "finished_date", - "fieldtype": "Date", - "label": "Batch Finished Date", - "oldfieldname": "finished_date", - "oldfieldtype": "Date", - "permlevel": 0 - }, { "fieldname": "expiry_date", "fieldtype": "Date", - "in_list_view": 1, + "in_list_view": 0, "label": "Expiry Date", "oldfieldname": "expiry_date", "oldfieldtype": "Date", @@ -67,7 +51,7 @@ { "fieldname": "description", "fieldtype": "Small Text", - "in_list_view": 1, + "in_list_view": 0, "label": "Batch Description", "oldfieldname": "description", "oldfieldtype": "Small Text", @@ -78,7 +62,7 @@ "icon": "icon-archive", "idx": 1, "max_attachments": 5, - "modified": "2015-01-05 16:11:40.125703", + "modified": "2015-01-07 16:24:13.422480", "modified_by": "Administrator", "module": "Stock", "name": "Batch", diff --git a/erpnext/stock/doctype/batch/batch_list.html b/erpnext/stock/doctype/batch/batch_list.html deleted file mode 100644 index cdccd8e8f5..0000000000 --- a/erpnext/stock/doctype/batch/batch_list.html +++ /dev/null @@ -1,18 +0,0 @@ -
-
- {%= list.get_avatar_and_id(doc) %} -
- -
diff --git a/erpnext/stock/doctype/batch/batch_list.js b/erpnext/stock/doctype/batch/batch_list.js index daeb69bfa4..c9a7e1516a 100644 --- a/erpnext/stock/doctype/batch/batch_list.js +++ b/erpnext/stock/doctype/batch/batch_list.js @@ -1,3 +1,10 @@ frappe.listview_settings['Batch'] = { - add_fields: ["item", "expiry_date"] + add_fields: ["item", "expiry_date"], + get_indicator: function(doc) { + if(doc.expiry_date && frappe.datetime.get_diff(doc.expiry_date) <= 0) { + return [__("Expired"), "red", "expiry_date,>=,Today"] + } else if(doc.expiry_date) { + return [__("Not Expired"), "darkgrey", "expiry_date,<,Today"] + } + } }; diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json index c3e2ead698..2fdb8e62fe 100644 --- a/erpnext/stock/doctype/item/item.json +++ b/erpnext/stock/doctype/item/item.json @@ -56,7 +56,7 @@ "fieldname": "item_name", "fieldtype": "Data", "in_filter": 1, - "in_list_view": 1, + "in_list_view": 0, "label": "Item Name", "oldfieldname": "item_name", "oldfieldtype": "Data", @@ -70,6 +70,7 @@ "fieldname": "item_group", "fieldtype": "Link", "in_filter": 1, + "in_list_view": 1, "label": "Item Group", "oldfieldname": "item_group", "oldfieldtype": "Link", @@ -115,7 +116,7 @@ "fieldname": "description", "fieldtype": "Small Text", "in_filter": 0, - "in_list_view": 1, + "in_list_view": 0, "label": "Description", "oldfieldname": "description", "oldfieldtype": "Text", @@ -132,7 +133,7 @@ }, { "fieldname": "image", - "fieldtype": "Attach", + "fieldtype": "Image", "label": "Image", "options": "", "permlevel": 0, @@ -876,7 +877,7 @@ "icon": "icon-tag", "idx": 1, "max_attachments": 1, - "modified": "2015-01-01 14:30:01.954176", + "modified": "2015-01-07 10:40:54.901356", "modified_by": "Administrator", "module": "Stock", "name": "Item", @@ -953,5 +954,6 @@ "role": "Manufacturing User" } ], - "search_fields": "item_name,description,item_group,customer_code" + "search_fields": "item_name,description,item_group,customer_code", + "title_field": "item_name" } \ No newline at end of file diff --git a/erpnext/stock/doctype/item/item_list.html b/erpnext/stock/doctype/item/item_list.html deleted file mode 100644 index caac310e04..0000000000 --- a/erpnext/stock/doctype/item/item_list.html +++ /dev/null @@ -1,20 +0,0 @@ -
-
-
- {%= list.get_avatar_and_id(doc) %} - {% if(doc.item_name != doc.name) { %} - {%= doc.item_name %} - {% } %} -
-
- -
- {% if(doc.image) { %} - - {% } %} -
-
diff --git a/erpnext/stock/doctype/item/item_list.js b/erpnext/stock/doctype/item/item_list.js index c6a437b1f1..7f4cf16972 100644 --- a/erpnext/stock/doctype/item/item_list.js +++ b/erpnext/stock/doctype/item/item_list.js @@ -1,5 +1,3 @@ frappe.listview_settings['Item'] = { - add_fields: ["item_name", "stock_uom", "item_group", "image", - "is_stock_item", "is_sales_item", "is_purchase_item", "show_in_website", - "default_bom"] + add_fields: ["item_name", "stock_uom", "item_group", "image"] };