From 738d4ef5c8202f02fe7d6bb4c85f65c7bdb06940 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 6 Jan 2015 18:08:44 +0530 Subject: [PATCH] [ui] [listviews] indicators --- .../doctype/journal_entry/journal_entry.json | 9 +- .../journal_entry/journal_entry_list.html | 15 - .../purchase_invoice/purchase_invoice.json | 6 +- .../purchase_invoice_list.html | 43 - .../purchase_invoice/purchase_invoice_list.js | 13 +- .../doctype/sales_invoice/sales_invoice.json | 6 +- .../sales_invoice/sales_invoice_list.html | 43 - .../sales_invoice/sales_invoice_list.js | 11 +- .../purchase_order/purchase_order.json | 1363 +++++++++-------- erpnext/buying/doctype/supplier/supplier.json | 4 +- .../doctype/supplier/supplier_list.html | 15 - .../selling/doctype/customer/customer.json | 5 +- .../doctype/customer/customer_list.html | 28 - erpnext/selling/doctype/lead/lead.json | 8 +- erpnext/selling/doctype/lead/lead_list.html | 12 - erpnext/selling/doctype/lead/lead_list.js | 8 +- .../selling/doctype/quotation/quotation.json | 4 +- .../doctype/quotation/quotation_list.html | 16 - .../doctype/quotation/quotation_list.js | 11 +- .../doctype/sales_order/sales_order.json | 7 +- .../doctype/sales_order/sales_order_list.html | 35 - .../doctype/sales_order/sales_order_list.js | 20 +- .../doctype/delivery_note/delivery_note.json | 5 +- .../delivery_note/delivery_note_list.html | 28 - .../material_request/material_request.json | 7 +- .../material_request_list.html | 20 - .../material_request/material_request_list.js | 11 +- .../purchase_receipt/purchase_receipt.json | 8 +- .../purchase_receipt_list.html | 34 - erpnext/support/doctype/issue/issue_list.js | 3 + 30 files changed, 787 insertions(+), 1011 deletions(-) delete mode 100644 erpnext/accounts/doctype/journal_entry/journal_entry_list.html delete mode 100644 erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.html delete mode 100644 erpnext/accounts/doctype/sales_invoice/sales_invoice_list.html delete mode 100644 erpnext/buying/doctype/supplier/supplier_list.html delete mode 100644 erpnext/selling/doctype/customer/customer_list.html delete mode 100644 erpnext/selling/doctype/lead/lead_list.html delete mode 100644 erpnext/selling/doctype/quotation/quotation_list.html delete mode 100644 erpnext/selling/doctype/sales_order/sales_order_list.html delete mode 100644 erpnext/stock/doctype/delivery_note/delivery_note_list.html delete mode 100644 erpnext/stock/doctype/material_request/material_request_list.html delete mode 100644 erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.html create mode 100644 erpnext/support/doctype/issue/issue_list.js diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.json b/erpnext/accounts/doctype/journal_entry/journal_entry.json index b631503a93..adb5f73279 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.json +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.json @@ -38,7 +38,7 @@ "fieldname": "voucher_type", "fieldtype": "Select", "in_filter": 1, - "in_list_view": 1, + "in_list_view": 0, "label": "Voucher Type", "oldfieldname": "voucher_type", "oldfieldtype": "Select", @@ -61,7 +61,7 @@ "fieldname": "posting_date", "fieldtype": "Date", "in_filter": 1, - "in_list_view": 1, + "in_list_view": 0, "label": "Posting Date", "no_copy": 1, "oldfieldname": "posting_date", @@ -154,7 +154,7 @@ "fieldname": "cheque_no", "fieldtype": "Data", "in_filter": 1, - "in_list_view": 1, + "in_list_view": 0, "label": "Reference Number", "no_copy": 1, "oldfieldname": "cheque_no", @@ -177,6 +177,7 @@ "fieldname": "user_remark", "fieldtype": "Small Text", "in_filter": 1, + "in_list_view": 1, "label": "User Remark", "no_copy": 1, "oldfieldname": "user_remark", @@ -448,7 +449,7 @@ "icon": "icon-file-text", "idx": 1, "is_submittable": 1, - "modified": "2015-01-05 10:54:54.294810", + "modified": "2015-01-06 12:01:51.379685", "modified_by": "Administrator", "module": "Accounts", "name": "Journal Entry", diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry_list.html b/erpnext/accounts/doctype/journal_entry/journal_entry_list.html deleted file mode 100644 index 0e08371570..0000000000 --- a/erpnext/accounts/doctype/journal_entry/journal_entry_list.html +++ /dev/null @@ -1,15 +0,0 @@ -
-
- {%= list.get_avatar_and_id(doc) %} -
- - -
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json index f88d5bc6f1..d0822b67ff 100755 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json @@ -51,7 +51,7 @@ "fieldname": "supplier_name", "fieldtype": "Data", "hidden": 0, - "in_list_view": 1, + "in_list_view": 0, "label": "Name", "oldfieldname": "supplier_name", "oldfieldtype": "Data", @@ -476,7 +476,7 @@ "fieldname": "outstanding_amount", "fieldtype": "Currency", "in_filter": 1, - "in_list_view": 1, + "in_list_view": 0, "label": "Outstanding Amount", "no_copy": 1, "oldfieldname": "outstanding_amount", @@ -880,7 +880,7 @@ "icon": "icon-file-text", "idx": 1, "is_submittable": 1, - "modified": "2015-01-05 10:57:10.892210", + "modified": "2015-01-06 17:07:12.151596", "modified_by": "Administrator", "module": "Accounts", "name": "Purchase Invoice", diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.html b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.html deleted file mode 100644 index 37ebe7f183..0000000000 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.html +++ /dev/null @@ -1,43 +0,0 @@ -
-
-
- {%= list.get_avatar_and_id(doc) %} -
-
-
- {% if(doc.outstanding_amount > 0 && doc.docstatus==1) { %} - {% if(frappe.datetime.get_diff(doc.due_date) < 0) { %} - - {%= __("Overdue: ") + comment_when(doc.due_date) %} - - {% } else { %} - - {%= doc.get_formatted("due_date") %} - {% } %} - {% } %} - {% if(doc.outstanding_amount==0 && doc.docstatus==1) { %} - - {%= __("Paid") %} - - {% } %} - {% if(doc.docstatus===0) { %} - {%= __("Draft") %} - {% } %} -
- -
-
- {%= doc.get_formatted("grand_total_import") %} -
-
-
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js index d72176a197..82112d1de3 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js @@ -4,5 +4,16 @@ // render frappe.listview_settings['Purchase Invoice'] = { add_fields: ["supplier", "supplier_name", "grand_total", "outstanding_amount", "due_date", "company", - "currency"] + "currency"], + get_indicator: function(doc) { + if(doc.outstanding_amount > 0 && doc.docstatus==1) { + if(frappe.datetime.get_diff(doc.due_date) < 0) { + return [__("Overdue"), "red", "outstanding_amount,>,0|due_date,<,Today"]; + } else { + return [__("Unpaid"), "orange", "outstanding_amount,>,0|due,>=,Today"]; + } + } else if(doc.outstanding_amount==0 && doc.docstatus==1) { + return [__("Paid"), "green", "outstanding_amount,=,0"]; + } + } }; diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json index 54258ae1a4..ef41c22d56 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json @@ -45,7 +45,7 @@ "fieldname": "customer_name", "fieldtype": "Data", "hidden": 0, - "in_list_view": 1, + "in_list_view": 0, "label": "Name", "oldfieldname": "customer_name", "oldfieldtype": "Data", @@ -515,7 +515,7 @@ { "fieldname": "outstanding_amount", "fieldtype": "Currency", - "in_list_view": 1, + "in_list_view": 0, "label": "Outstanding Amount", "no_copy": 1, "oldfieldname": "outstanding_amount", @@ -1192,7 +1192,7 @@ "icon": "icon-file-text", "idx": 1, "is_submittable": 1, - "modified": "2015-01-05 10:57:31.054236", + "modified": "2015-01-06 11:55:32.975513", "modified_by": "Administrator", "module": "Accounts", "name": "Sales Invoice", diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.html b/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.html deleted file mode 100644 index 6161b00a11..0000000000 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.html +++ /dev/null @@ -1,43 +0,0 @@ -
-
-
- {%= list.get_avatar_and_id(doc) %} -
-
-
- {% if(doc.outstanding_amount > 0 && doc.docstatus==1) { %} - {% if(frappe.datetime.get_diff(doc.due_date) < 0) { %} - - {%= __("Overdue") %} - - {% } else { %} - - {%= doc.get_formatted("due_date") %} - {% } %} - {% } %} - {% if(doc.outstanding_amount==0 && doc.docstatus==1) { %} - - {%= __("Paid") %} - - {% } %} - {% if(doc.docstatus===0) { %} - {%= __("Draft") %} - {% } %} -
- -
-
- {%= doc.get_formatted("grand_total_export") %} -
-
-
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js index ea2986a79f..6f194760ae 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js @@ -5,5 +5,14 @@ frappe.listview_settings['Sales Invoice'] = { add_fields: ["customer", "customer_name", "grand_total", "outstanding_amount", "due_date", "company", "currency"], - filters: [["outstanding_amount", ">", "0"]] + filters: [["outstanding_amount", ">", "0"]], + get_indicator: function(doc) { + if(doc.outstanding_amount==0) { + return [__("Paid"), "green", "oustanding_amount,=,0"] + } else if (doc.outstanding_amount > 0 && doc.due_date > frappe.datetime.get_today()) { + return [__("Unpaid"), "orange", "oustanding_amount,>,0|due_date,>,Today"] + } else if (doc.outstanding_amount > 0 && doc.due_date <= frappe.datetime.get_today()) { + return [__("Overdue"), "red", "oustanding_amount,>,0|due_date,<=,Today"] + } + } }; diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json index 8c4f80cd1e..0f24d59e02 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.json +++ b/erpnext/buying/doctype/purchase_order/purchase_order.json @@ -1,850 +1,851 @@ { - "allow_import": 1, - "autoname": "naming_series:", - "creation": "2013-05-21 16:16:39", - "docstatus": 0, - "doctype": "DocType", - "document_type": "Transaction", + "allow_import": 1, + "autoname": "naming_series:", + "creation": "2013-05-21 16:16:39", + "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": "PO-", - "permlevel": 0, - "print_hide": 1, + "fieldname": "naming_series", + "fieldtype": "Select", + "label": "Series", + "no_copy": 1, + "oldfieldname": "naming_series", + "oldfieldtype": "Select", + "options": "PO-", + "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": 0, - "ignore_user_permissions": 1, - "label": "Amended From", - "no_copy": 1, - "oldfieldname": "amended_from", - "oldfieldtype": "Data", - "options": "Purchase Order", - "permlevel": 0, - "print_hide": 1, - "read_only": 1, + "fieldname": "amended_from", + "fieldtype": "Link", + "hidden": 0, + "ignore_user_permissions": 1, + "label": "Amended From", + "no_copy": 1, + "oldfieldname": "amended_from", + "oldfieldtype": "Data", + "options": "Purchase Order", + "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": "price_list_and_currency", - "fieldtype": "Section Break", - "label": "Currency and Price List", - "options": "icon-tag", + "fieldname": "price_list_and_currency", + "fieldtype": "Section Break", + "label": "Currency and Price List", + "options": "icon-tag", "permlevel": 0 - }, + }, { - "fieldname": "cb_currency", - "fieldtype": "Column Break", + "fieldname": "cb_currency", + "fieldtype": "Column Break", "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", + "fieldname": "cb_price_list", + "fieldtype": "Column Break", "permlevel": 0 - }, + }, { - "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 - }, + }, { - "fieldname": "price_list_currency", - "fieldtype": "Link", - "label": "Price List Currency", - "options": "Currency", - "permlevel": 0, - "print_hide": 1, + "fieldname": "price_list_currency", + "fieldtype": "Link", + "label": "Price List Currency", + "options": "Currency", + "permlevel": 0, + "print_hide": 1, "read_only": 1 - }, + }, { - "fieldname": "plc_conversion_rate", - "fieldtype": "Float", - "label": "Price List Exchange Rate", - "permlevel": 0, + "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": "Purchase Order Item", + "allow_on_submit": 1, + "fieldname": "items", + "fieldtype": "Table", + "label": "Items", + "no_copy": 0, + "oldfieldname": "po_details", + "oldfieldtype": "Table", + "options": "Purchase Order Item", "permlevel": 0 - }, + }, { - "fieldname": "sb_last_purchase", - "fieldtype": "Section Break", + "fieldname": "sb_last_purchase", + "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_26", - "fieldtype": "Column Break", + "fieldname": "column_break_26", + "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": "get_last_purchase_rate", - "fieldtype": "Button", - "label": "Get Last Purchase Rate", - "oldfieldtype": "Button", - "permlevel": 0, + "fieldname": "get_last_purchase_rate", + "fieldtype": "Button", + "label": "Get Last Purchase Rate", + "oldfieldtype": "Button", + "permlevel": 0, "print_hide": 0 - }, + }, { - "fieldname": "taxes_section", - "fieldtype": "Section Break", - "label": "Taxes and Charges", - "oldfieldtype": "Section Break", - "options": "icon-money", - "permlevel": 0, + "fieldname": "taxes_section", + "fieldtype": "Section Break", + "label": "Taxes and Charges", + "oldfieldtype": "Section Break", + "options": "icon-money", + "permlevel": 0, "print_hide": 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": 0, - "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": 0, + "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 - }, + }, { - "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": "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 - }, + }, { - "fieldname": "advance_paid", - "fieldtype": "Currency", - "label": "Advance Paid", - "permlevel": 0, - "print_hide": 1, + "fieldname": "advance_paid", + "fieldtype": "Currency", + "label": "Advance Paid", + "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 - }, + }, { - "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": "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": "cb_contact", - "fieldtype": "Column Break", + "fieldname": "cb_contact", + "fieldtype": "Column Break", "permlevel": 0 - }, + }, { - "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", + "fieldname": "more_info", + "fieldtype": "Section Break", + "label": "More Info", + "oldfieldtype": "Section Break", "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": "ref_sq", - "fieldtype": "Data", - "hidden": 1, - "label": "Ref SQ", - "no_copy": 1, - "oldfieldname": "ref_sq", - "oldfieldtype": "Data", - "permlevel": 0, - "print_hide": 1, + "fieldname": "ref_sq", + "fieldtype": "Data", + "hidden": 1, + "label": "Ref SQ", + "no_copy": 1, + "oldfieldname": "ref_sq", + "oldfieldtype": "Data", + "permlevel": 0, + "print_hide": 1, "read_only": 1 - }, + }, { - "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": "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 - }, + }, { - "fieldname": "column_break5", - "fieldtype": "Column Break", - "oldfieldtype": "Column Break", - "permlevel": 0, - "print_hide": 1, - "print_width": "50%", + "fieldname": "column_break5", + "fieldtype": "Column Break", + "oldfieldtype": "Column Break", + "permlevel": 0, + "print_hide": 1, + "print_width": "50%", "width": "50%" - }, + }, { - "depends_on": "eval:!doc.__islocal", - "description": "% of materials received against this Purchase Order", - "fieldname": "per_received", - "fieldtype": "Percent", - "in_list_view": 1, - "label": "% Received", - "no_copy": 1, - "oldfieldname": "per_received", - "oldfieldtype": "Currency", - "permlevel": 0, - "print_hide": 1, + "depends_on": "eval:!doc.__islocal", + "description": "% of materials received against this Purchase Order", + "fieldname": "per_received", + "fieldtype": "Percent", + "in_list_view": 1, + "label": "% Received", + "no_copy": 1, + "oldfieldname": "per_received", + "oldfieldtype": "Currency", + "permlevel": 0, + "print_hide": 1, "read_only": 1 - }, + }, { - "depends_on": "eval:!doc.__islocal", - "description": "% of materials billed against this Purchase Order.", - "fieldname": "per_billed", - "fieldtype": "Percent", - "in_list_view": 1, - "label": "% Billed", - "no_copy": 1, - "oldfieldname": "per_billed", - "oldfieldtype": "Currency", - "permlevel": 0, - "print_hide": 1, + "depends_on": "eval:!doc.__islocal", + "description": "% of materials billed against this Purchase Order.", + "fieldname": "per_billed", + "fieldtype": "Percent", + "in_list_view": 1, + "label": "% Billed", + "no_copy": 1, + "oldfieldname": "per_billed", + "oldfieldtype": "Currency", + "permlevel": 0, + "print_hide": 1, "read_only": 1 - }, + }, { - "description": "Required raw materials issued to the supplier for producing a sub - contracted item.", - "fieldname": "raw_material_details", - "fieldtype": "Section Break", - "label": "Raw Materials Supplied", - "oldfieldtype": "Section Break", - "options": "icon-truck", - "permlevel": 0, + "description": "Required raw materials issued to the supplier for producing a sub - contracted item.", + "fieldname": "raw_material_details", + "fieldtype": "Section Break", + "label": "Raw Materials Supplied", + "oldfieldtype": "Section Break", + "options": "icon-truck", + "permlevel": 0, "print_hide": 1 - }, + }, { - "allow_on_submit": 1, - "fieldname": "supplied_items", - "fieldtype": "Table", - "label": "Supplied Items", - "no_copy": 0, - "oldfieldname": "po_raw_material_details", - "oldfieldtype": "Table", - "options": "Purchase Order Item Supplied", - "permlevel": 0, - "print_hide": 1, + "allow_on_submit": 1, + "fieldname": "supplied_items", + "fieldtype": "Table", + "label": "Supplied Items", + "no_copy": 0, + "oldfieldname": "po_raw_material_details", + "oldfieldtype": "Table", + "options": "Purchase Order Item Supplied", + "permlevel": 0, + "print_hide": 1, "read_only": 1 - }, + }, { - "fieldname": "recurring_order", - "fieldtype": "Section Break", - "label": "Recurring Order", - "options": "icon-time", + "fieldname": "recurring_order", + "fieldtype": "Section Break", + "label": "Recurring Order", + "options": "icon-time", "permlevel": 0 - }, + }, { - "fieldname": "column_break", - "fieldtype": "Column Break", - "label": "Column Break", + "fieldname": "column_break", + "fieldtype": "Column Break", + "label": "Column Break", "permlevel": 0 - }, + }, { - "allow_on_submit": 1, - "depends_on": "eval:doc.docstatus<2", - "description": "Check if recurring order, uncheck to stop recurring or put proper End Date", - "fieldname": "is_recurring", - "fieldtype": "Check", - "label": "Is Recurring", - "no_copy": 1, - "permlevel": 0, + "allow_on_submit": 1, + "depends_on": "eval:doc.docstatus<2", + "description": "Check if recurring order, uncheck to stop recurring or put proper End Date", + "fieldname": "is_recurring", + "fieldtype": "Check", + "label": "Is Recurring", + "no_copy": 1, + "permlevel": 0, "print_hide": 1 - }, + }, { - "allow_on_submit": 1, - "depends_on": "eval:doc.is_recurring==1", - "fieldname": "recurring_type", - "fieldtype": "Select", - "label": "Recurring Type", - "no_copy": 1, - "options": "Monthly\nQuarterly\nHalf-yearly\nYearly", - "permlevel": 0, + "allow_on_submit": 1, + "depends_on": "eval:doc.is_recurring==1", + "fieldname": "recurring_type", + "fieldtype": "Select", + "label": "Recurring Type", + "no_copy": 1, + "options": "Monthly\nQuarterly\nHalf-yearly\nYearly", + "permlevel": 0, "print_hide": 1 - }, + }, { - "allow_on_submit": 1, - "depends_on": "eval:doc.is_recurring==1", - "description": "Start date of current order's period", - "fieldname": "from_date", - "fieldtype": "Date", - "label": "From Date", - "no_copy": 1, - "permlevel": 0, + "allow_on_submit": 1, + "depends_on": "eval:doc.is_recurring==1", + "description": "Start date of current order's period", + "fieldname": "from_date", + "fieldtype": "Date", + "label": "From Date", + "no_copy": 1, + "permlevel": 0, "print_hide": 1 - }, + }, { - "allow_on_submit": 1, - "depends_on": "eval:doc.is_recurring==1", - "description": "End date of current order's period", - "fieldname": "to_date", - "fieldtype": "Date", - "label": "To Date", - "no_copy": 1, - "permlevel": 0, + "allow_on_submit": 1, + "depends_on": "eval:doc.is_recurring==1", + "description": "End date of current order's period", + "fieldname": "to_date", + "fieldtype": "Date", + "label": "To Date", + "no_copy": 1, + "permlevel": 0, "print_hide": 1 - }, + }, { - "allow_on_submit": 1, - "depends_on": "eval:doc.is_recurring==1", - "description": "The day of the month on which auto order will be generated e.g. 05, 28 etc", - "fieldname": "repeat_on_day_of_month", - "fieldtype": "Int", - "label": "Repeat on Day of Month", - "no_copy": 1, - "permlevel": 0, + "allow_on_submit": 1, + "depends_on": "eval:doc.is_recurring==1", + "description": "The day of the month on which auto order will be generated e.g. 05, 28 etc", + "fieldname": "repeat_on_day_of_month", + "fieldtype": "Int", + "label": "Repeat on Day of Month", + "no_copy": 1, + "permlevel": 0, "print_hide": 1 - }, + }, { - "allow_on_submit": 1, - "depends_on": "eval:doc.is_recurring==1", - "description": "The date on which recurring order will be stop", - "fieldname": "end_date", - "fieldtype": "Date", - "label": "End Date", - "no_copy": 1, - "permlevel": 0, + "allow_on_submit": 1, + "depends_on": "eval:doc.is_recurring==1", + "description": "The date on which recurring order will be stop", + "fieldname": "end_date", + "fieldtype": "Date", + "label": "End Date", + "no_copy": 1, + "permlevel": 0, "print_hide": 1 - }, + }, { - "fieldname": "column_break83", - "fieldtype": "Column Break", - "label": "Column Break", - "permlevel": 0, + "fieldname": "column_break83", + "fieldtype": "Column Break", + "label": "Column Break", + "permlevel": 0, "print_hide": 1 - }, + }, { - "depends_on": "eval:doc.is_recurring==1", - "description": "The date on which next invoice will be generated. It is generated on submit.", - "fieldname": "next_date", - "fieldtype": "Date", - "label": "Next Date", - "no_copy": 1, - "permlevel": 0, - "print_hide": 1, + "depends_on": "eval:doc.is_recurring==1", + "description": "The date on which next invoice will be generated. It is generated on submit.", + "fieldname": "next_date", + "fieldtype": "Date", + "label": "Next Date", + "no_copy": 1, + "permlevel": 0, + "print_hide": 1, "read_only": 1 - }, + }, { - "depends_on": "eval:doc.is_recurring==1", - "fieldname": "recurring_id", - "fieldtype": "Data", - "label": "Recurring Id", - "no_copy": 1, - "permlevel": 0, - "print_hide": 1, + "depends_on": "eval:doc.is_recurring==1", + "fieldname": "recurring_id", + "fieldtype": "Data", + "label": "Recurring Id", + "no_copy": 1, + "permlevel": 0, + "print_hide": 1, "read_only": 1 - }, + }, { - "allow_on_submit": 1, - "depends_on": "eval:doc.is_recurring==1", - "description": "Enter email id separated by commas, order will be mailed automatically on particular date", - "fieldname": "notification_email_address", - "fieldtype": "Small Text", - "label": "Notification Email Address", - "no_copy": 1, - "permlevel": 0, + "allow_on_submit": 1, + "depends_on": "eval:doc.is_recurring==1", + "description": "Enter email id separated by commas, order will be mailed automatically on particular date", + "fieldname": "notification_email_address", + "fieldtype": "Small Text", + "label": "Notification Email Address", + "no_copy": 1, + "permlevel": 0, "print_hide": 1 } - ], - "icon": "icon-file-text", - "idx": 1, - "is_submittable": 1, - "modified": "2014-12-24 14:30:24.868635", - "modified_by": "Administrator", - "module": "Buying", - "name": "Purchase Order", - "owner": "Administrator", + ], + "icon": "icon-file-text", + "idx": 1, + "is_submittable": 1, + "modified": "2015-01-06 17:41:57.148411", + "modified_by": "Administrator", + "module": "Buying", + "name": "Purchase Order", + "owner": "Administrator", "permissions": [ { - "amend": 0, - "apply_user_permissions": 1, - "cancel": 0, - "create": 0, - "delete": 0, - "email": 0, - "permlevel": 0, - "print": 0, - "read": 1, - "report": 1, - "role": "Material User", - "submit": 0, + "amend": 0, + "apply_user_permissions": 1, + "cancel": 0, + "create": 0, + "delete": 0, + "email": 0, + "permlevel": 0, + "print": 0, + "read": 1, + "report": 1, + "role": "Material User", + "submit": 0, "write": 0 - }, + }, { - "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": 1, - "create": 1, - "delete": 1, - "email": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "Purchase User", - "submit": 1, + "amend": 1, + "apply_user_permissions": 1, + "cancel": 1, + "create": 1, + "delete": 1, + "email": 1, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, + "role": "Purchase User", + "submit": 1, "write": 1 - }, + }, { - "apply_user_permissions": 1, - "cancel": 0, - "delete": 0, - "email": 1, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, + "apply_user_permissions": 1, + "cancel": 0, + "delete": 0, + "email": 1, + "permlevel": 0, + "print": 1, + "read": 1, + "report": 1, "role": "Supplier" - }, + }, { - "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/supplier.json b/erpnext/buying/doctype/supplier/supplier.json index d7c3b41409..9fcb1162f1 100644 --- a/erpnext/buying/doctype/supplier/supplier.json +++ b/erpnext/buying/doctype/supplier/supplier.json @@ -29,7 +29,7 @@ { "fieldname": "supplier_name", "fieldtype": "Data", - "in_list_view": 1, + "in_list_view": 0, "label": "Supplier Name", "no_copy": 1, "oldfieldname": "supplier_name", @@ -183,7 +183,7 @@ ], "icon": "icon-user", "idx": 1, - "modified": "2014-12-24 16:23:47.943887", + "modified": "2015-01-06 17:32:39.936580", "modified_by": "Administrator", "module": "Buying", "name": "Supplier", diff --git a/erpnext/buying/doctype/supplier/supplier_list.html b/erpnext/buying/doctype/supplier/supplier_list.html deleted file mode 100644 index cf5e708e4d..0000000000 --- a/erpnext/buying/doctype/supplier/supplier_list.html +++ /dev/null @@ -1,15 +0,0 @@ -
-
- {%= list.get_avatar_and_id(doc) %} - {% if(doc.supplier_name != doc.name) { %} - - {%= doc.supplier_name %} - {% } %} -
- -
diff --git a/erpnext/selling/doctype/customer/customer.json b/erpnext/selling/doctype/customer/customer.json index 8cfdbc0225..1ebe461be4 100644 --- a/erpnext/selling/doctype/customer/customer.json +++ b/erpnext/selling/doctype/customer/customer.json @@ -31,7 +31,7 @@ "fieldtype": "Data", "hidden": 0, "in_filter": 1, - "in_list_view": 1, + "in_list_view": 0, "label": "Full Name", "no_copy": 1, "oldfieldname": "customer_name", @@ -78,6 +78,7 @@ "fieldtype": "Link", "hidden": 0, "in_filter": 1, + "in_list_view": 1, "label": "Customer Group", "oldfieldname": "customer_group", "oldfieldtype": "Link", @@ -266,7 +267,7 @@ ], "icon": "icon-user", "idx": 1, - "modified": "2015-01-01 14:30:00.368262", + "modified": "2015-01-06 17:08:55.045595", "modified_by": "Administrator", "module": "Selling", "name": "Customer", diff --git a/erpnext/selling/doctype/customer/customer_list.html b/erpnext/selling/doctype/customer/customer_list.html deleted file mode 100644 index b7cf35862d..0000000000 --- a/erpnext/selling/doctype/customer/customer_list.html +++ /dev/null @@ -1,28 +0,0 @@ -
-
-
- {%= list.get_avatar_and_id(doc) %} - {% if(doc.customer_name != doc.name) { %} - - {%= doc.customer_name %} - {% } %} - - -
-
- - -
diff --git a/erpnext/selling/doctype/lead/lead.json b/erpnext/selling/doctype/lead/lead.json index cff5f97f1d..c88c8771eb 100644 --- a/erpnext/selling/doctype/lead/lead.json +++ b/erpnext/selling/doctype/lead/lead.json @@ -28,7 +28,7 @@ "fieldname": "lead_name", "fieldtype": "Data", "in_filter": 1, - "in_list_view": 1, + "in_list_view": 0, "label": "Contact Name", "oldfieldname": "lead_name", "oldfieldtype": "Data", @@ -63,7 +63,7 @@ "fieldname": "status", "fieldtype": "Select", "in_filter": 1, - "in_list_view": 1, + "in_list_view": 0, "label": "Status", "no_copy": 1, "oldfieldname": "status", @@ -77,7 +77,7 @@ "fieldname": "source", "fieldtype": "Select", "in_filter": 1, - "in_list_view": 1, + "in_list_view": 0, "label": "Source", "no_copy": 1, "oldfieldname": "source", @@ -331,7 +331,7 @@ ], "icon": "icon-user", "idx": 1, - "modified": "2015-01-01 14:30:02.458843", + "modified": "2015-01-06 17:13:05.622160", "modified_by": "Administrator", "module": "Selling", "name": "Lead", diff --git a/erpnext/selling/doctype/lead/lead_list.html b/erpnext/selling/doctype/lead/lead_list.html deleted file mode 100644 index 7494f4c68f..0000000000 --- a/erpnext/selling/doctype/lead/lead_list.html +++ /dev/null @@ -1,12 +0,0 @@ -
-
- {%= list.get_avatar_and_id(doc) %} - - {%= doc.company_name %} -
- -
diff --git a/erpnext/selling/doctype/lead/lead_list.js b/erpnext/selling/doctype/lead/lead_list.js index b1733710a2..9bbde6c4af 100644 --- a/erpnext/selling/doctype/lead/lead_list.js +++ b/erpnext/selling/doctype/lead/lead_list.js @@ -1,3 +1,9 @@ frappe.listview_settings['Lead'] = { - add_fields: ["territory", "company_name", "status", "source"] + add_fields: ["territory", "company_name", "status", "source"], + get_indicator: function(doc) { + var indicator = [__(doc.status), "darkgrey", "status,=," + doc.status]; + if(doc.status==="Open") indicator[1] = "red"; + if(doc.status==="Opportunity") indicator[1] = "green"; + return indicator; + } }; diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json index 0bdd02966b..0f856d7d1b 100644 --- a/erpnext/selling/doctype/quotation/quotation.json +++ b/erpnext/selling/doctype/quotation/quotation.json @@ -81,7 +81,7 @@ "fieldname": "customer_name", "fieldtype": "Data", "hidden": 1, - "in_list_view": 1, + "in_list_view": 0, "label": "Customer / Lead Name", "permlevel": 0, "read_only": 1 @@ -800,7 +800,7 @@ "idx": 1, "is_submittable": 1, "max_attachments": 1, - "modified": "2015-01-05 12:33:02.162194", + "modified": "2015-01-06 17:17:04.598365", "modified_by": "Administrator", "module": "Selling", "name": "Quotation", diff --git a/erpnext/selling/doctype/quotation/quotation_list.html b/erpnext/selling/doctype/quotation/quotation_list.html deleted file mode 100644 index 716b77ae52..0000000000 --- a/erpnext/selling/doctype/quotation/quotation_list.html +++ /dev/null @@ -1,16 +0,0 @@ -
-
- {%= list.get_avatar_and_id(doc) %} -
- - -
diff --git a/erpnext/selling/doctype/quotation/quotation_list.js b/erpnext/selling/doctype/quotation/quotation_list.js index bbc264d033..7481e9841c 100644 --- a/erpnext/selling/doctype/quotation/quotation_list.js +++ b/erpnext/selling/doctype/quotation/quotation_list.js @@ -1,4 +1,11 @@ frappe.listview_settings['Quotation'] = { - add_fields: ["customer_name", "quotation_to", "grand_total", "status", - "company", "currency", "order_type", "lead", "customer"] + add_fields: ["customer_name", "grand_total", "status", + "company", "currency"], + get_indicator: function(doc) { + if(doc.status==="Ordered") { + return [__("Ordered"), "green", "status,=,Ordered"]; + } else if(doc.status==="Lost") { + return [__("Lost"), "darkgrey", "status,=,Lost"]; + } + } }; diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json index 34720446ba..6a7e00e624 100644 --- a/erpnext/selling/doctype/sales_order/sales_order.json +++ b/erpnext/selling/doctype/sales_order/sales_order.json @@ -38,7 +38,7 @@ "fieldname": "customer", "fieldtype": "Link", "in_filter": 1, - "in_list_view": 1, + "in_list_view": 0, "label": "Customer", "oldfieldname": "customer", "oldfieldtype": "Link", @@ -93,7 +93,7 @@ "default": "Sales", "fieldname": "order_type", "fieldtype": "Select", - "in_list_view": 1, + "in_list_view": 0, "label": "Order Type", "oldfieldname": "order_type", "oldfieldtype": "Select", @@ -509,6 +509,7 @@ { "fieldname": "grand_total_export", "fieldtype": "Currency", + "in_list_view": 1, "label": "Grand Total", "oldfieldname": "grand_total_export", "oldfieldtype": "Currency", @@ -1021,7 +1022,7 @@ "idx": 1, "is_submittable": 1, "issingle": 0, - "modified": "2015-01-05 12:25:02.687860", + "modified": "2015-01-06 17:28:44.639230", "modified_by": "Administrator", "module": "Selling", "name": "Sales Order", diff --git a/erpnext/selling/doctype/sales_order/sales_order_list.html b/erpnext/selling/doctype/sales_order/sales_order_list.html deleted file mode 100644 index 4833f3d002..0000000000 --- a/erpnext/selling/doctype/sales_order/sales_order_list.html +++ /dev/null @@ -1,35 +0,0 @@ -
-
-
- {%= list.get_avatar_and_id(doc) %} -
-
- - -
diff --git a/erpnext/selling/doctype/sales_order/sales_order_list.js b/erpnext/selling/doctype/sales_order/sales_order_list.js index bb441c0d6c..6458ae9d50 100644 --- a/erpnext/selling/doctype/sales_order/sales_order_list.js +++ b/erpnext/selling/doctype/sales_order/sales_order_list.js @@ -1,6 +1,18 @@ frappe.listview_settings['Sales Order'] = { - add_fields: ["`tabSales Order`.`grand_total`", "`tabSales Order`.`company`", "`tabSales Order`.`currency`", - "`tabSales Order`.`customer`", "`tabSales Order`.`customer_name`", "`tabSales Order`.`per_delivered`", - "`tabSales Order`.`per_billed`", "`tabSales Order`.`delivery_date`"], - filters: [["per_delivered", "<", 100]] + add_fields: ["grand_total", "customer_name", "currency", "delivery_date", "per_delivered", "per_billed", + "status"], + filters: [["per_delivered", "<", 100]], + get_indicator: function(doc) { + if(doc.status==="Stopped") { + return [__("Stopped"), "red", "status,=,Stopped"]; + } else if(doc.per_delivered < 100 && frappe.datetime.get_diff(doc.delivery_date) < 0) { + return [__("Overdue"), "red", "per_delivered,<,100|delivery_date,<,Today|status,!=,Stopped"]; + } else if(doc.per_delivered < 100 && doc.status!=="Stopped") { + return [__("Not Delivered"), "orange", "per_delivered,<,100|status,!=,Stopped"]; + } else if(doc.per_delivered == 100 && doc.per_billed < 100 && doc.status!=="Stopped") { + return [__("To Bill"), "orange", "per_delivered,=,100|per_billed,<,100|status,!=,Stopped"]; + } else if(doc.per_delivered == 100 && doc.per_billed == 100 && doc.status!=="Stopped") { + return [__("Completed"), "green", "per_delivered,=,100|per_billed,=,100|status,!=,Stopped"]; + } + } }; diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json index 32682c9b3d..bfa3e39d82 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.json +++ b/erpnext/stock/doctype/delivery_note/delivery_note.json @@ -53,7 +53,7 @@ "fieldname": "customer_name", "fieldtype": "Data", "hidden": 0, - "in_list_view": 1, + "in_list_view": 0, "label": "Customer Name", "permlevel": 0, "read_only": 1 @@ -531,6 +531,7 @@ { "fieldname": "grand_total_export", "fieldtype": "Currency", + "in_list_view": 1, "label": "Grand Total", "no_copy": 0, "oldfieldname": "grand_total_export", @@ -1013,7 +1014,7 @@ "idx": 1, "in_create": 0, "is_submittable": 1, - "modified": "2015-01-05 15:51:31.663904", + "modified": "2015-01-06 17:34:32.623408", "modified_by": "Administrator", "module": "Stock", "name": "Delivery Note", diff --git a/erpnext/stock/doctype/delivery_note/delivery_note_list.html b/erpnext/stock/doctype/delivery_note/delivery_note_list.html deleted file mode 100644 index 66a49f8b60..0000000000 --- a/erpnext/stock/doctype/delivery_note/delivery_note_list.html +++ /dev/null @@ -1,28 +0,0 @@ -
-
-
- {%= list.get_avatar_and_id(doc) %} - {% if(doc.transporter_name) { %} - - - - {% } %} -
-
- - -
diff --git a/erpnext/stock/doctype/material_request/material_request.json b/erpnext/stock/doctype/material_request/material_request.json index a1ccb64f57..bd7dab6074 100644 --- a/erpnext/stock/doctype/material_request/material_request.json +++ b/erpnext/stock/doctype/material_request/material_request.json @@ -113,6 +113,7 @@ { "fieldname": "requested_by", "fieldtype": "Data", + "in_list_view": 1, "label": "Requested For", "permlevel": 0 }, @@ -157,7 +158,7 @@ "fieldname": "status", "fieldtype": "Select", "in_filter": 1, - "in_list_view": 1, + "in_list_view": 0, "label": "Status", "no_copy": 1, "oldfieldname": "status", @@ -195,7 +196,7 @@ "description": "% of materials ordered against this Material Request", "fieldname": "per_ordered", "fieldtype": "Percent", - "in_list_view": 1, + "in_list_view": 0, "label": "% Completed", "no_copy": 1, "oldfieldname": "per_ordered", @@ -235,7 +236,7 @@ "icon": "icon-ticket", "idx": 1, "is_submittable": 1, - "modified": "2015-01-05 15:17:13.466750", + "modified": "2015-01-06 17:38:12.250644", "modified_by": "Administrator", "module": "Stock", "name": "Material Request", diff --git a/erpnext/stock/doctype/material_request/material_request_list.html b/erpnext/stock/doctype/material_request/material_request_list.html deleted file mode 100644 index 2290a3a503..0000000000 --- a/erpnext/stock/doctype/material_request/material_request_list.html +++ /dev/null @@ -1,20 +0,0 @@ -
-
- {%= list.get_avatar_and_id(doc) %} -
- -
diff --git a/erpnext/stock/doctype/material_request/material_request_list.js b/erpnext/stock/doctype/material_request/material_request_list.js index 989ca60707..f0d97cb17c 100644 --- a/erpnext/stock/doctype/material_request/material_request_list.js +++ b/erpnext/stock/doctype/material_request/material_request_list.js @@ -1,4 +1,13 @@ frappe.listview_settings['Material Request'] = { add_fields: ["material_request_type", "status", "per_ordered"], - filters: [["per_ordered", "<", 100]] + filters: [["per_ordered", "<", 100]], + get_status: function(doc) { + if(doc.status=="Stopped") { + return [__("Stopped"), "red", "status,=,Stopped"]; + } if(doc.docstatus==1 && doc.per_ordered < 100) { + return [__("Pending"), "orange", "per_ordered,<,100"]; + } else if(doc.status==1 && doc.per_ordered == 100) { + return [__("Completed"), "green", "per_ordered,=,100"]; + } + } }; diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json index 9ffed672dd..2618de22d2 100755 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json @@ -53,7 +53,7 @@ "fieldname": "supplier_name", "fieldtype": "Data", "hidden": 0, - "in_list_view": 1, + "in_list_view": 0, "label": "Supplier Name", "permlevel": 0, "read_only": 1 @@ -411,6 +411,7 @@ { "fieldname": "grand_total_import", "fieldtype": "Currency", + "in_list_view": 1, "label": "Grand Total", "oldfieldname": "grand_total_import", "oldfieldtype": "Currency", @@ -766,7 +767,7 @@ "icon": "icon-truck", "idx": 1, "is_submittable": 1, - "modified": "2014-12-24 14:31:25.348050", + "modified": "2015-01-06 17:40:23.838112", "modified_by": "Administrator", "module": "Stock", "name": "Purchase Receipt", @@ -844,5 +845,6 @@ "read_only_onload": 1, "search_fields": "status, posting_date, supplier", "sort_field": "modified", - "sort_order": "DESC" + "sort_order": "DESC", + "title_field": "supplier_name" } \ No newline at end of file diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.html b/erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.html deleted file mode 100644 index 558b160586..0000000000 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.html +++ /dev/null @@ -1,34 +0,0 @@ -
-
-
- {%= list.get_avatar_and_id(doc) %} - - - {%= doc.supplier_name %} - {% if(cint(doc.is_subcontracted)) { %} - - - - {% } %} - {% if(doc.transporter_name) { %} - - - - {% } %} - {% if(doc.docstatus===0) { %} - {%= __("Draft") %} - {% } %} -
-
-
-
- {%= doc.get_formatted("grand_total_import") %} -
-
-
diff --git a/erpnext/support/doctype/issue/issue_list.js b/erpnext/support/doctype/issue/issue_list.js new file mode 100644 index 0000000000..02fd40c210 --- /dev/null +++ b/erpnext/support/doctype/issue/issue_list.js @@ -0,0 +1,3 @@ +frappe.listview_settings['Issue'] = { + colwidths: {"subject": 6} +}