diff --git a/erpnext/accounts/doctype/journal_voucher/journal_voucher.json b/erpnext/accounts/doctype/journal_voucher/journal_voucher.json index ac402662b6..187c59a3fc 100644 --- a/erpnext/accounts/doctype/journal_voucher/journal_voucher.json +++ b/erpnext/accounts/doctype/journal_voucher/journal_voucher.json @@ -440,7 +440,7 @@ "icon": "icon-file-text", "idx": 1, "is_submittable": 1, - "modified": "2014-05-27 03:49:12.326026", + "modified": "2014-07-31 05:05:03.294068", "modified_by": "Administrator", "module": "Accounts", "name": "Journal Voucher", diff --git a/erpnext/accounts/doctype/journal_voucher/journal_voucher_list.html b/erpnext/accounts/doctype/journal_voucher/journal_voucher_list.html new file mode 100644 index 0000000000..aaa3854fef --- /dev/null +++ b/erpnext/accounts/doctype/journal_voucher/journal_voucher_list.html @@ -0,0 +1,20 @@ +
+
+
+ {%= list.get_avatar_and_id(doc) %} + + {%= doc.get_formatted("posting_date") %} + + {%= doc.voucher_type %} + + {% if(doc.docstatus===0) { %} + {%= __("Draft") %} + {% } %} +
+
+
+ {%= doc.get_formatted("total_debit") %} +
+
diff --git a/erpnext/accounts/doctype/journal_voucher/journal_voucher_list.js b/erpnext/accounts/doctype/journal_voucher/journal_voucher_list.js new file mode 100644 index 0000000000..06d578abaa --- /dev/null +++ b/erpnext/accounts/doctype/journal_voucher/journal_voucher_list.js @@ -0,0 +1,3 @@ +frappe.listview_settings['Journal Voucher'] = { + add_fields: ["voucher_type", "posting_date", "total_debit", "company"] +}; diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json index 8e675ef8b1..51cb306157 100644 --- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json +++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json @@ -128,8 +128,9 @@ } ], "hide_toolbar": 1, + "icon": "icon-resize-horizontal", "issingle": 1, - "modified": "2014-07-22 14:53:59.084438", + "modified": "2014-07-31 05:43:03.410832", "modified_by": "Administrator", "module": "Accounts", "name": "Payment Reconciliation", @@ -139,7 +140,7 @@ { "cancel": 0, "create": 1, - "delete": 0, + "delete": 1, "permlevel": 0, "read": 1, "role": "Accounts Manager", @@ -149,7 +150,7 @@ { "cancel": 0, "create": 1, - "delete": 0, + "delete": 1, "permlevel": 0, "read": 1, "role": "Accounts User", diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.html b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.html new file mode 100644 index 0000000000..3305d42887 --- /dev/null +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.html @@ -0,0 +1,43 @@ +
+
+
+ {%= list.get_avatar_and_id(doc) %} + + + {%= doc.supplier_name %} + {% 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") %} + {% } %} +
+
+
+ {% var completed = cint((doc.grand_total - doc.outstanding_amount) * 100 / doc.grand_total), title = __("Outstanding Amount") + ": " + doc.get_formatted("outstanding_amount") %} + {% include "templates/form_grid/includes/progress.html" %} +
+
+ {%= doc.get_formatted("grand_total") %} +
+
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js index 61d2750c3e..d72176a197 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.js @@ -3,10 +3,6 @@ // render frappe.listview_settings['Purchase Invoice'] = { - add_fields: ["`tabPurchase Invoice`.grand_total", "`tabPurchase Invoice`.outstanding_amount"], - add_columns: [{"content":"paid_amount", width:"10%", type:"bar-graph", label: "Paid"}], - prepare_data: function(data) { - data.paid_amount = flt(data.grand_total) ? (((flt(data.grand_total) - - flt(data.outstanding_amount)) / flt(data.grand_total)) * 100) : 0; - } + add_fields: ["supplier", "supplier_name", "grand_total", "outstanding_amount", "due_date", "company", + "currency"] }; diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.html b/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.html new file mode 100644 index 0000000000..783e425533 --- /dev/null +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.html @@ -0,0 +1,43 @@ +
+
+
+ {%= list.get_avatar_and_id(doc) %} + + + {%= doc.customer_name %} + {% 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") %} + {% } %} +
+
+
+ {% var completed = cint((doc.grand_total - doc.outstanding_amount) * 100 / doc.grand_total), title = __("Outstanding Amount") + ": " + doc.get_formatted("outstanding_amount") %} + {% include "templates/form_grid/includes/progress.html" %} +
+
+ {%= doc.get_formatted("grand_total") %} +
+
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js index 42c80b4e26..2cb7b4c281 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.js @@ -3,14 +3,6 @@ // render frappe.listview_settings['Sales Invoice'] = { - add_fields: ["`tabSales Invoice`.grand_total", "`tabSales Invoice`.outstanding_amount"], - add_columns: [{"content":"Percent Paid", width:"10%", type:"bar-graph", - label: "Payment Received"}], - prepare_data: function(data) { - if (data.docstatus === 1) { - data["Percent Paid"] = flt(data.grand_total) - ? (((flt(data.grand_total) - flt(data.outstanding_amount)) / flt(data.grand_total)) * 100) - : 100.0; - } - } + add_fields: ["customer", "customer_name", "grand_total", "outstanding_amount", "due_date", "company", + "currency"] }; diff --git a/erpnext/hr/doctype/earning_type/earning_type.json b/erpnext/hr/doctype/earning_type/earning_type.json index 85c6323db8..507acd9fd7 100644 --- a/erpnext/hr/doctype/earning_type/earning_type.json +++ b/erpnext/hr/doctype/earning_type/earning_type.json @@ -27,33 +27,11 @@ "permlevel": 0, "reqd": 0, "width": "300px" - }, - { - "fieldname": "taxable", - "fieldtype": "Select", - "in_list_view": 1, - "label": "Taxable", - "oldfieldname": "taxable", - "oldfieldtype": "Select", - "options": "\nYes\nNo", - "permlevel": 0, - "reqd": 1 - }, - { - "depends_on": "eval:doc.taxable=='No'", - "fieldname": "exemption_limit", - "fieldtype": "Float", - "hidden": 0, - "in_list_view": 1, - "label": "Exemption Limit", - "oldfieldname": "exemption_limit", - "oldfieldtype": "Currency", - "permlevel": 0 } ], "icon": "icon-flag", "idx": 1, - "modified": "2014-05-27 03:49:10.133416", + "modified": "2014-07-31 07:25:26.606030", "modified_by": "Administrator", "module": "HR", "name": "Earning Type", diff --git a/erpnext/manufacturing/doctype/bom/bom_list.html b/erpnext/manufacturing/doctype/bom/bom_list.html new file mode 100644 index 0000000000..23e5a38ab1 --- /dev/null +++ b/erpnext/manufacturing/doctype/bom/bom_list.html @@ -0,0 +1,18 @@ +
+
+
+ {%= 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 new file mode 100644 index 0000000000..71d54a20dc --- /dev/null +++ b/erpnext/manufacturing/doctype/bom/bom_list.js @@ -0,0 +1,3 @@ +frappe.listview_settings['BOM'] = { + add_fields: ["is_active", "is_default", "total_cost"] +}; diff --git a/erpnext/stock/doctype/delivery_note/delivery_note_list.html b/erpnext/stock/doctype/delivery_note/delivery_note_list.html new file mode 100644 index 0000000000..c4df5de704 --- /dev/null +++ b/erpnext/stock/doctype/delivery_note/delivery_note_list.html @@ -0,0 +1,29 @@ +
+
+
+ {%= list.get_avatar_and_id(doc) %} + + + {%= doc.customer_name %} + {% if(doc.transporter_name) { %} + + + + {% } %} + {% if(doc.docstatus===0) { %} + {%= __("Draft") %} + {% } %} +
+
+
+ {% var completed = doc.per_installed, title=__("% Installed") %} + {% include "templates/form_grid/includes/progress.html" %} +
+
+ {%= doc.get_formatted("grand_total") %} +
+
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note_list.js b/erpnext/stock/doctype/delivery_note/delivery_note_list.js new file mode 100644 index 0000000000..c28067d44e --- /dev/null +++ b/erpnext/stock/doctype/delivery_note/delivery_note_list.js @@ -0,0 +1,4 @@ +frappe.listview_settings['Delivery Note'] = { + add_fields: ["customer", "customer_name", "grand_total", "per_installed", + "transporter_name"] +}; diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.html b/erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.html new file mode 100644 index 0000000000..89baea5e29 --- /dev/null +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.html @@ -0,0 +1,32 @@ +
+
+
+ {%= 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") %} +
+
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.js new file mode 100644 index 0000000000..7869f7f7da --- /dev/null +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.js @@ -0,0 +1,4 @@ +frappe.listview_settings['Purchase Receipt'] = { + add_fields: ["supplier", "supplier_name", "grand_total", "is_subcontracted", + "transporter_name"] +}; diff --git a/erpnext/utilities/doctype/address/address_list.js b/erpnext/utilities/doctype/address/address_list.js new file mode 100644 index 0000000000..5eee8cf6f6 --- /dev/null +++ b/erpnext/utilities/doctype/address/address_list.js @@ -0,0 +1,5 @@ +frappe.listview_settings['Address'] = { + set_title_left: function() { + frappe.set_route("Module", "Selling"); + } +} diff --git a/erpnext/utilities/doctype/contact/contact_list.js b/erpnext/utilities/doctype/contact/contact_list.js new file mode 100644 index 0000000000..5eee8cf6f6 --- /dev/null +++ b/erpnext/utilities/doctype/contact/contact_list.js @@ -0,0 +1,5 @@ +frappe.listview_settings['Address'] = { + set_title_left: function() { + frappe.set_route("Module", "Selling"); + } +}