diff --git a/erpnext/buying/doctype/purchase_order/purchase_order_list.html b/erpnext/buying/doctype/purchase_order/purchase_order_list.html new file mode 100644 index 00000000000..beb97f43b7e --- /dev/null +++ b/erpnext/buying/doctype/purchase_order/purchase_order_list.html @@ -0,0 +1,32 @@ +
+
+
+ {%= 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) %} + {% } %} +
+
+
+ {% 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") %} +
+
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order_list.js b/erpnext/buying/doctype/purchase_order/purchase_order_list.js new file mode 100644 index 00000000000..f4e5d3de486 --- /dev/null +++ b/erpnext/buying/doctype/purchase_order/purchase_order_list.js @@ -0,0 +1,4 @@ +frappe.listview_settings['Purchase Order'] = { + add_fields: ["grand_total", "company", "currency", "supplier", + "supplier_name", "per_received", "per_billed"] +}; diff --git a/erpnext/buying/doctype/supplier/supplier_list.html b/erpnext/buying/doctype/supplier/supplier_list.html new file mode 100644 index 00000000000..5cab239b62d --- /dev/null +++ b/erpnext/buying/doctype/supplier/supplier_list.html @@ -0,0 +1,15 @@ +
+
+
+ {%= list.get_avatar_and_id(doc) %} + {% if(doc.supplier_name != doc.name) { %} + + {%= doc.supplier_name %} + {% } %} + + {%= doc.supplier_type %} + +
+
+
diff --git a/erpnext/buying/doctype/supplier/supplier_list.js b/erpnext/buying/doctype/supplier/supplier_list.js new file mode 100644 index 00000000000..d26932c915c --- /dev/null +++ b/erpnext/buying/doctype/supplier/supplier_list.js @@ -0,0 +1,3 @@ +frappe.listview_settings['Supplier'] = { + add_fields: ["supplier_name", "supplier_type"] +}; diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.html b/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.html new file mode 100644 index 00000000000..bd833c31d67 --- /dev/null +++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.html @@ -0,0 +1,20 @@ +
+
+
+ {%= list.get_avatar_and_id(doc) %} + + + {%= doc.supplier %} + + + {%= doc.status %} +
+
+
+ {%= doc.get_formatted("grand_total") %} +
+
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js b/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js new file mode 100644 index 00000000000..d62a0e2435e --- /dev/null +++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.js @@ -0,0 +1,3 @@ +frappe.listview_settings['Supplier Quotation'] = { + add_fields: ["supplier", "grand_total", "status", "company", "currency"] +}; diff --git a/erpnext/selling/doctype/customer/customer_list.html b/erpnext/selling/doctype/customer/customer_list.html new file mode 100644 index 00000000000..3656d106a01 --- /dev/null +++ b/erpnext/selling/doctype/customer/customer_list.html @@ -0,0 +1,29 @@ +
+
+
+ {%= list.get_avatar_and_id(doc) %} + {% if(doc.customer_name != doc.name) { %} + + {%= doc.customer_name %} + {% } %} + + {% if(doc.customer_type==="Company") { %} + + {% } else { %} + + {% } %} + + + {%= doc.customer_group %} + {% if(doc.territory) { %} + + + {%= doc.territory %} + {% } %} +
+
+
diff --git a/erpnext/selling/doctype/customer/customer_list.js b/erpnext/selling/doctype/customer/customer_list.js new file mode 100644 index 00000000000..012d3f81dda --- /dev/null +++ b/erpnext/selling/doctype/customer/customer_list.js @@ -0,0 +1,3 @@ +frappe.listview_settings['Customer'] = { + add_fields: ["customer_name", "territory", "customer_group", "customer_type"] +}; diff --git a/erpnext/selling/doctype/lead/lead_list.html b/erpnext/selling/doctype/lead/lead_list.html new file mode 100644 index 00000000000..d5799b9611e --- /dev/null +++ b/erpnext/selling/doctype/lead/lead_list.html @@ -0,0 +1,18 @@ +
+
+
+ {%= list.get_avatar_and_id(doc) %} + + {%= doc.company_name %} + {%= doc.status %} + {% if(doc.territory) { %} + + + {%= doc.territory %} + {% } %} +
+
+
diff --git a/erpnext/selling/doctype/lead/lead_list.js b/erpnext/selling/doctype/lead/lead_list.js new file mode 100644 index 00000000000..b1733710a2b --- /dev/null +++ b/erpnext/selling/doctype/lead/lead_list.js @@ -0,0 +1,3 @@ +frappe.listview_settings['Lead'] = { + add_fields: ["territory", "company_name", "status", "source"] +}; diff --git a/erpnext/selling/doctype/opportunity/opportunity_list.html b/erpnext/selling/doctype/opportunity/opportunity_list.html new file mode 100644 index 00000000000..c0a948340de --- /dev/null +++ b/erpnext/selling/doctype/opportunity/opportunity_list.html @@ -0,0 +1,23 @@ +
+
+
+ {%= list.get_avatar_and_id(doc) %} + + + {%= doc.customer_name %} ({%= doc.enquiry_from %}) + + {% if(doc.enquiry_type==="Sales") { %} + + {% } else { %} + + {% } %} + + {%= doc.status %} +
+
+
diff --git a/erpnext/selling/doctype/opportunity/opportunity_list.js b/erpnext/selling/doctype/opportunity/opportunity_list.js new file mode 100644 index 00000000000..06fbe3443ef --- /dev/null +++ b/erpnext/selling/doctype/opportunity/opportunity_list.js @@ -0,0 +1,3 @@ +frappe.listview_settings['Opportunity'] = { + add_fields: ["customer_name", "enquiry_type", "enquiry_from", "status"] +}; diff --git a/erpnext/selling/doctype/quotation/quotation_list.html b/erpnext/selling/doctype/quotation/quotation_list.html new file mode 100644 index 00000000000..afdce255077 --- /dev/null +++ b/erpnext/selling/doctype/quotation/quotation_list.html @@ -0,0 +1,29 @@ +
+
+
+ {%= list.get_avatar_and_id(doc) %} + + + {%= doc.customer_name %} ({%= doc.quotation_to %}) + + + + {% if(doc.order_type==="Service") { %} + + {% } else { %} + + {% } %} + + {%= doc.status %} +
+
+
+ {%= doc.get_formatted("grand_total") %} +
+
diff --git a/erpnext/selling/doctype/quotation/quotation_list.js b/erpnext/selling/doctype/quotation/quotation_list.js new file mode 100644 index 00000000000..bbc264d033f --- /dev/null +++ b/erpnext/selling/doctype/quotation/quotation_list.js @@ -0,0 +1,4 @@ +frappe.listview_settings['Quotation'] = { + add_fields: ["customer_name", "quotation_to", "grand_total", "status", + "company", "currency", "order_type", "lead", "customer"] +}; diff --git a/erpnext/selling/doctype/sales_order/sales_order_list.html b/erpnext/selling/doctype/sales_order/sales_order_list.html index e07fdd08d59..2861de036c7 100644 --- a/erpnext/selling/doctype/sales_order/sales_order_list.html +++ b/erpnext/selling/doctype/sales_order/sales_order_list.html @@ -1,8 +1,41 @@
-
{%= list.get_avatar_and_id(doc) %} - {%= doc.customer_name %} +
+
+ {%= list.get_avatar_and_id(doc) %} + + + {%= doc.customer_name %} + {% if(doc.per_delivered < 100 && doc.status!=="Stopped") { %} + {% if(frappe.datetime.get_diff(doc.delivery_date) < 0) { %} + + {%= __("Overdue") %} + + {% } else { %} + + {%= doc.get_formatted("delivery_date")%} + {% } %} + {% } %} + {% if(doc.status==="Stopped") { %} + {%= __("Stopped") %} + {% } %} +
-
- {%= row.get_formatted("grand_total") %} +
+ {% var completed = doc.per_delivered, title = __("Delivered") %} + {% 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") %}
diff --git a/erpnext/selling/doctype/sales_order/sales_order_list.js b/erpnext/selling/doctype/sales_order/sales_order_list.js index e2ce67d6978..0eab5de4a5d 100644 --- a/erpnext/selling/doctype/sales_order/sales_order_list.js +++ b/erpnext/selling/doctype/sales_order/sales_order_list.js @@ -1,3 +1,4 @@ frappe.listview_settings['Sales Order'] = { - add_fields: ["grand_total", "company", "currency", "customer_name"] + add_fields: ["grand_total", "company", "currency", "customer", + "customer_name", "per_delivered", "per_billed", "delivery_date"] }; diff --git a/erpnext/stock/doctype/item/item_list.html b/erpnext/stock/doctype/item/item_list.html new file mode 100644 index 00000000000..ebc2c7f345d --- /dev/null +++ b/erpnext/stock/doctype/item/item_list.html @@ -0,0 +1,53 @@ +
+
+
+ {%= list.get_avatar_and_id(doc) %} + {% if(doc.item_name != doc.name) { %} + {%= doc.item_name %} + {% } %} + {% if(doc.is_stock_item==="Yes") { %} + + + + {% } %} + {% if(doc.is_sales_item==="Yes") { %} + + + + {% } %} + {% if(doc.is_purchase_item==="Yes") { %} + + + + {% } %} + {% if(doc.is_manufactured_item==="Yes") { %} + + + + {% } %} + {% if(doc.show_in_website) { %} + + + + {% } %} + + {%= doc.item_group %} +
+
+
+ {% if(doc.image) { %} + + {% } %} +
+
diff --git a/erpnext/stock/doctype/item/item_list.js b/erpnext/stock/doctype/item/item_list.js new file mode 100644 index 00000000000..330faedf625 --- /dev/null +++ b/erpnext/stock/doctype/item/item_list.js @@ -0,0 +1,5 @@ +frappe.listview_settings['Item'] = { + add_fields: ["item_name", "stock_uom", "item_group", "image", + "is_stock_item", "is_sales_item", "is_purchase_item", + "is_manufactured_item", "show_in_website"] +}; diff --git a/erpnext/stock/doctype/material_request/material_request_list.html b/erpnext/stock/doctype/material_request/material_request_list.html new file mode 100644 index 00000000000..750f6506ec3 --- /dev/null +++ b/erpnext/stock/doctype/material_request/material_request_list.html @@ -0,0 +1,28 @@ +
+
+
+ {%= list.get_avatar_and_id(doc) %} + + {% if(doc.material_request_type==="Purchase") { %} + + {% } else { %} + + {% } %} + + {% if(doc.status=="Draft") { %} + {%= doc.status %} + {% } %} + {% if(doc.status=="Submitted" && doc.per_ordered < 100) { %} + {%= __("Pending") %} + {% } %} +
+
+
+ {% var completed = doc.per_ordered, title = __("Ordered") %} + {% include "templates/form_grid/includes/progress.html" %} +
+
diff --git a/erpnext/stock/doctype/material_request/material_request_list.js b/erpnext/stock/doctype/material_request/material_request_list.js new file mode 100644 index 00000000000..2a85dcc8148 --- /dev/null +++ b/erpnext/stock/doctype/material_request/material_request_list.js @@ -0,0 +1,3 @@ +frappe.listview_settings['Material Request'] = { + add_fields: ["material_request_type", "status", "per_ordered"] +}; diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_list.html b/erpnext/stock/doctype/stock_entry/stock_entry_list.html new file mode 100644 index 00000000000..63fc2eb14ff --- /dev/null +++ b/erpnext/stock/doctype/stock_entry/stock_entry_list.html @@ -0,0 +1,48 @@ +
+
+
+ {%= list.get_avatar_and_id(doc) %} + {% var icon = { + "Material Issue": "icon-arrow-right", + "Material Receipt": "icon-arrow-left", + "Material Transfer": "icon-resize-horizontal", + "Manufacture/Repack": "icon-wrench", + "Sales Return": "icon-warning-sign", + "Purchase Return": "icon-warning-sign", + "Subcontract": "icon-truck" + }[doc.purpose]; %} + + + + {% if(doc.from_warehouse) { %} + + {%= doc.from_warehouse %} + + {% } %} + + {% if(doc.to_warehouse) { %} + + {%= doc.to_warehouse %} + + {% } %} + {% if(doc.production_order) { %} + + + + {% } %} + {% if(doc.bom_no) { %} + + + + {% } %} +
+
+
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_list.js b/erpnext/stock/doctype/stock_entry/stock_entry_list.js new file mode 100644 index 00000000000..e6a2abcf76f --- /dev/null +++ b/erpnext/stock/doctype/stock_entry/stock_entry_list.js @@ -0,0 +1,3 @@ +frappe.listview_settings['Stock Entry'] = { + add_fields: ["from_warehouse", "to_warehouse", "purpose", "production_order", "bom_no"] +}; diff --git a/erpnext/templates/form_grid/includes/progress.html b/erpnext/templates/form_grid/includes/progress.html new file mode 100644 index 00000000000..9cbe5abd643 --- /dev/null +++ b/erpnext/templates/form_grid/includes/progress.html @@ -0,0 +1,8 @@ +
+
+
+
diff --git a/erpnext/templates/form_grid/includes/visible_cols.html b/erpnext/templates/form_grid/includes/visible_cols.html index 82f15c29dbe..38abdd03f3c 100644 --- a/erpnext/templates/form_grid/includes/visible_cols.html +++ b/erpnext/templates/form_grid/includes/visible_cols.html @@ -1,12 +1,12 @@ {% $.each(visible_columns || [], function(i, df) { %} - {% var val = row.get_formatted(df.fieldname); + {% var val = doc.get_formatted(df.fieldname); if(val) { %}
{%= __(df.label) %}:
- {%= row.get_formatted(df.fieldname) %} + {%= doc.get_formatted(df.fieldname) %}
{% } %} diff --git a/erpnext/templates/form_grid/item_grid.html b/erpnext/templates/form_grid/item_grid.html index 2c03ef9b713..73e6c2efddd 100644 --- a/erpnext/templates/form_grid/item_grid.html +++ b/erpnext/templates/form_grid/item_grid.html @@ -27,30 +27,23 @@ (frappe.datetime.get_diff(doc.schedule_date) < 1 && doc.received_qty < doc.qty) ? "label-danger" : "label-default" %}"> - {%= row.get_formatted("schedule_date") %} + {%= doc.get_formatted("schedule_date") %} {% } %}
- {%= row.get_formatted("qty") %} + {%= doc.get_formatted("qty") %}
{%= doc.uom || doc.stock_uom %} {% if(in_list(["Sales Order Item", "Purchase Order Item"], doc.doctype) && frm.doc.docstatus===1) { var delivered = doc.doctype==="Sales Order Item" ? doc.delivered_qty : doc.received_qty, - percent_delivered = - 100 - cint((doc.qty - delivered) * 100 / doc.qty); + completed = + 100 - cint((doc.qty - delivered) * 100 / doc.qty), + title = __("Delivered"); %} -
-
- {%= percent_delivered %}% -
-
+ {% include "templates/form_grid/includes/progress.html" %} {% } %} {% if(doc.warehouse) { var label_class = "label-default", @@ -78,7 +71,7 @@
- {%= row.get_formatted("rate") %} + {%= doc.get_formatted("rate") %} {% if(doc.discount_percentage) { %}
@@ -88,21 +81,15 @@
- {%= row.get_formatted("amount") %} + {%= doc.get_formatted("amount") %} {% if(in_list(["Sales Order Item", "Purchase Order Item"], doc.doctype) && frm.doc.docstatus===1 && doc.amount) { - var percent_billed = - 100 - cint((doc.amount - doc.billed_amt) * 100 / doc.amount); + var completed = + 100 - cint((doc.amount - doc.billed_amt) * 100 / doc.amount), + title = __("Billed"); %}
  -
-
- {%= percent_billed %}% -
-
+ {% include "templates/form_grid/includes/progress.html" %} {% } %}
diff --git a/erpnext/templates/form_grid/material_request_grid.html b/erpnext/templates/form_grid/material_request_grid.html index 53b875a312d..6b709d497ea 100644 --- a/erpnext/templates/form_grid/material_request_grid.html +++ b/erpnext/templates/form_grid/material_request_grid.html @@ -1,4 +1,4 @@ -{% var visible_columns = row.get_visible_columns(["item_code", +{% var visible_columns = row.get_visible_columns(["item_code", "warehouse", "item_name", "description", "amount", "stock_uom", "uom", "qty"]); %} {% if(!doc) { %} @@ -16,28 +16,21 @@ {% include "templates/form_grid/includes/visible_cols.html" %} {% if(doc.schedule_date) { %}
- {%= row.get_formatted("schedule_date") %} + {%= doc.get_formatted("schedule_date") %} {% } %}
- {%= row.get_formatted("qty") %} + {%= doc.get_formatted("qty") %} {%= doc.uom || doc.stock_uom %} - {% var percent_delivered = - 100 - cint((doc.qty - cint(doc.ordered_qty)) * 100 / doc.qty); %} -
-
- {%= percent_delivered %}% -
-
+ {% var completed = + 100 - cint((doc.qty - cint(doc.ordered_qty)) * 100 / doc.qty), + title = __("Ordered"); %} + {% include "templates/form_grid/includes/progress.html" %} {% if(doc.warehouse) { %}
- {%= row.get_formatted("qty") %} + {%= doc.get_formatted("qty") %}
{%= doc.uom || doc.stock_uom %}
- {%= row.get_formatted("amount") %} + {%= doc.get_formatted("amount") %}
- {%= row.get_formatted("incoming_rate") %}
+ {%= doc.get_formatted("incoming_rate") %}
{% } %} diff --git a/erpnext/utilities/doctype/contact/contact.json b/erpnext/utilities/doctype/contact/contact.json index fc5a72189bf..c52cfdca51d 100644 --- a/erpnext/utilities/doctype/contact/contact.json +++ b/erpnext/utilities/doctype/contact/contact.json @@ -16,6 +16,7 @@ { "fieldname": "first_name", "fieldtype": "Data", + "in_list_view": 0, "label": "First Name", "oldfieldname": "first_name", "oldfieldtype": "Data", @@ -25,6 +26,7 @@ { "fieldname": "last_name", "fieldtype": "Data", + "in_list_view": 0, "label": "Last Name", "oldfieldname": "last_name", "oldfieldtype": "Data", @@ -39,6 +41,7 @@ "default": "Passive", "fieldname": "status", "fieldtype": "Select", + "in_list_view": 1, "label": "Status", "options": "Passive\nOpen\nReplied", "permlevel": 0 @@ -46,7 +49,7 @@ { "fieldname": "email_id", "fieldtype": "Data", - "in_list_view": 1, + "in_list_view": 0, "label": "Email Id", "oldfieldname": "email_id", "oldfieldtype": "Data", @@ -100,7 +103,7 @@ "depends_on": "eval:!doc.supplier && !doc.sales_partner", "fieldname": "customer_name", "fieldtype": "Data", - "in_list_view": 1, + "in_list_view": 0, "label": "Customer Name", "permlevel": 0, "read_only": 1 @@ -125,7 +128,7 @@ "depends_on": "eval:!doc.customer && !doc.sales_partner", "fieldname": "supplier_name", "fieldtype": "Data", - "in_list_view": 1, + "in_list_view": 0, "label": "Supplier Name", "permlevel": 0, "read_only": 1 @@ -199,7 +202,7 @@ "idx": 1, "in_create": 0, "in_dialog": 0, - "modified": "2014-05-27 03:49:08.789451", + "modified": "2014-07-30 05:44:25.767076", "modified_by": "Administrator", "module": "Utilities", "name": "Contact", diff --git a/erpnext/utilities/doctype/note/note.json b/erpnext/utilities/doctype/note/note.json index 6cf756c3aa1..66d99f4cd36 100644 --- a/erpnext/utilities/doctype/note/note.json +++ b/erpnext/utilities/doctype/note/note.json @@ -9,7 +9,7 @@ { "fieldname": "title", "fieldtype": "Data", - "in_list_view": 1, + "in_list_view": 0, "label": "Title", "permlevel": 0, "print_hide": 1, @@ -19,7 +19,7 @@ "description": "Help: To link to another record in the system, use \"#Form/Note/[Note Name]\" as the Link URL. (don't use \"http://\")", "fieldname": "content", "fieldtype": "Text Editor", - "in_list_view": 1, + "in_list_view": 0, "label": "Content", "permlevel": 0 }, @@ -49,7 +49,7 @@ ], "icon": "icon-file-text", "idx": 1, - "modified": "2014-07-09 12:54:11.897597", + "modified": "2014-07-30 03:24:38.302928", "modified_by": "Administrator", "module": "Utilities", "name": "Note", diff --git a/erpnext/utilities/doctype/note/test_note.py b/erpnext/utilities/doctype/note/test_note.py new file mode 100644 index 00000000000..997c57be174 --- /dev/null +++ b/erpnext/utilities/doctype/note/test_note.py @@ -0,0 +1,10 @@ +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors and Contributors +# See license.txt + +import frappe +import unittest + +test_records = frappe.get_test_records('Note') + +class TestNote(unittest.TestCase): + pass diff --git a/erpnext/utilities/doctype/note/test_records.json b/erpnext/utilities/doctype/note/test_records.json new file mode 100644 index 00000000000..9dc992c0807 --- /dev/null +++ b/erpnext/utilities/doctype/note/test_records.json @@ -0,0 +1,6 @@ +[ + { + "doctype": "Note", + "name": "_Test Note 1" + } +]