diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py index 74a9628209..55e3247636 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py @@ -14,6 +14,10 @@ import frappe.defaults from erpnext.controllers.buying_controller import BuyingController from erpnext.accounts.party import get_party_account, get_due_date +form_grid_templates = { + "entries": "templates/form_grid/item_grid.html" +} + class PurchaseInvoice(BuyingController): tname = 'Purchase Invoice Item' fname = 'entries' diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.html b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.html index 3305d42887..cccd38a67c 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.html +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice_list.html @@ -10,7 +10,7 @@ {% if(frappe.datetime.get_diff(doc.due_date) < 0) { %} + data-filter="outstanding_amount,>,0|due_date,<,Today"> {%= __("Overdue: ") + comment_when(doc.due_date) %} {% } else { %} @@ -38,6 +38,8 @@ {% include "templates/form_grid/includes/progress.html" %}
- {%= doc.get_formatted("grand_total") %} +
+ {%= doc.get_formatted("grand_total_import") %} +
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.html b/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.html index de8451eb20..47fadb5420 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.html +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice_list.html @@ -38,6 +38,8 @@ {% include "templates/form_grid/includes/progress.html" %}
- {%= doc.get_formatted("grand_total") %} +
+ {%= doc.get_formatted("grand_total_export") %} +
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order_list.html b/erpnext/buying/doctype/purchase_order/purchase_order_list.html index 4806cfb1e7..a2031c0bf0 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order_list.html +++ b/erpnext/buying/doctype/purchase_order/purchase_order_list.html @@ -32,6 +32,8 @@ {% include "templates/form_grid/includes/progress.html" %}
- {%= doc.get_formatted("grand_total") %} +
+ {%= doc.get_formatted("grand_total_import") %} +
diff --git a/erpnext/buying/doctype/supplier/supplier.json b/erpnext/buying/doctype/supplier/supplier.json index 752f342cf2..6a34e7d35f 100644 --- a/erpnext/buying/doctype/supplier/supplier.json +++ b/erpnext/buying/doctype/supplier/supplier.json @@ -186,7 +186,7 @@ ], "icon": "icon-user", "idx": 1, - "modified": "2014-05-27 03:49:20.060872", + "modified": "2014-08-07 06:57:15.274795", "modified_by": "Administrator", "module": "Buying", "name": "Supplier", @@ -231,5 +231,6 @@ "role": "Accounts User" } ], - "search_fields": "supplier_name,supplier_type" + "search_fields": "supplier_name,supplier_type", + "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 index bd833c31d6..9aa9d5bef9 100644 --- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.html +++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation_list.html @@ -15,6 +15,8 @@
- {%= doc.get_formatted("grand_total") %} +
+ {%= doc.get_formatted("grand_total_import") %} +
diff --git a/erpnext/manufacturing/doctype/production_order/production_order_list.html b/erpnext/manufacturing/doctype/production_order/production_order_list.html index 4cdaa542b8..a856a0e5f1 100644 --- a/erpnext/manufacturing/doctype/production_order/production_order_list.html +++ b/erpnext/manufacturing/doctype/production_order/production_order_list.html @@ -17,14 +17,14 @@ {% } else { %} {%= doc.get_formatted("expected_delivery_date")%} {% } %} {% } %} {% if(per == 100 && doc.status!=="Stopped") { %} + data-filter="produced_qty,=,{%= doc.qty %}|status,!=,Stopped"> {% } %} {% if(doc.status==="Stopped") { %} diff --git a/erpnext/projects/doctype/task/task.py b/erpnext/projects/doctype/task/task.py index 7ca502d91e..8d63f12e67 100644 --- a/erpnext/projects/doctype/task/task.py +++ b/erpnext/projects/doctype/task/task.py @@ -63,13 +63,12 @@ def get_events(start, end, filters=None): data = frappe.db.sql("""select name, exp_start_date, exp_end_date, subject, status, project from `tabTask` where ((ifnull(exp_start_date, '0000-00-00')!= '0000-00-00') \ - and (exp_start_date between '%(start)s' and '%(end)s') \ + and (exp_start_date between %(start)s and %(end)s) \ or ((ifnull(exp_start_date, '0000-00-00')!= '0000-00-00') \ - and exp_end_date between '%(start)s' and '%(end)s')) - %(conditions)s""" % { + and exp_end_date between %(start)s and %(end)s)) + {conditions}""".format(conditions=conditions), { "start": start, - "end": end, - "conditions": conditions + "end": end }, as_dict=True, update={"allDay": 0}) return data diff --git a/erpnext/projects/doctype/time_log_batch/time_log_batch_list.js b/erpnext/projects/doctype/time_log_batch/time_log_batch_list.js index a0825a2709..cc6746e353 100644 --- a/erpnext/projects/doctype/time_log_batch/time_log_batch_list.js +++ b/erpnext/projects/doctype/time_log_batch/time_log_batch_list.js @@ -1,4 +1,3 @@ frappe.listview_settings['Time Log Batch'] = { - add_fields: ["status", "total_hours", "rate"], - filters:[["status","in", "Draft,Submitted"]] + add_fields: ["status", "total_hours", "rate"] }; diff --git a/erpnext/selling/doctype/customer/customer.json b/erpnext/selling/doctype/customer/customer.json index 794b763090..ef71d56ad5 100644 --- a/erpnext/selling/doctype/customer/customer.json +++ b/erpnext/selling/doctype/customer/customer.json @@ -282,7 +282,7 @@ ], "icon": "icon-user", "idx": 1, - "modified": "2014-05-27 03:49:09.208254", + "modified": "2014-08-07 06:57:25.248707", "modified_by": "Administrator", "module": "Selling", "name": "Customer", @@ -332,5 +332,6 @@ "write": 1 } ], - "search_fields": "customer_name,customer_group,territory" + "search_fields": "customer_name,customer_group,territory", + "title_field": "customer_name" } \ No newline at end of file diff --git a/erpnext/selling/doctype/quotation/quotation_list.html b/erpnext/selling/doctype/quotation/quotation_list.html index afdce25507..2126b5257a 100644 --- a/erpnext/selling/doctype/quotation/quotation_list.html +++ b/erpnext/selling/doctype/quotation/quotation_list.html @@ -24,6 +24,8 @@
- {%= doc.get_formatted("grand_total") %} +
+ {%= doc.get_formatted("grand_total_export") %} +
diff --git a/erpnext/selling/doctype/sales_order/sales_order_list.html b/erpnext/selling/doctype/sales_order/sales_order_list.html index ffa3c01c0d..4079b2a6e7 100644 --- a/erpnext/selling/doctype/sales_order/sales_order_list.html +++ b/erpnext/selling/doctype/sales_order/sales_order_list.html @@ -41,6 +41,8 @@ {% include "templates/form_grid/includes/progress.html" %}
- {%= doc.get_formatted("grand_total") %} +
+ {%= doc.get_formatted("grand_total_export") %} +
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note_list.html b/erpnext/stock/doctype/delivery_note/delivery_note_list.html index c4df5de704..de0af976d1 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note_list.html +++ b/erpnext/stock/doctype/delivery_note/delivery_note_list.html @@ -24,6 +24,8 @@ {% include "templates/form_grid/includes/progress.html" %}
- {%= doc.get_formatted("grand_total") %} +
+ {%= doc.get_formatted("grand_total_export") %} +
diff --git a/erpnext/stock/doctype/material_request_item/material_request_item.json b/erpnext/stock/doctype/material_request_item/material_request_item.json index 61b03f8719..56d4121868 100644 --- a/erpnext/stock/doctype/material_request_item/material_request_item.json +++ b/erpnext/stock/doctype/material_request_item/material_request_item.json @@ -109,7 +109,7 @@ "allow_on_submit": 0, "fieldname": "schedule_date", "fieldtype": "Date", - "in_list_view": 1, + "in_list_view": 0, "label": "Required Date", "no_copy": 0, "oldfieldname": "schedule_date", @@ -234,7 +234,7 @@ ], "idx": 1, "istable": 1, - "modified": "2014-07-18 01:04:18.470761", + "modified": "2014-08-07 07:12:47.994668", "modified_by": "Administrator", "module": "Stock", "name": "Material Request Item", diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.html b/erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.html index 89baea5e29..558b160586 100644 --- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.html +++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt_list.html @@ -27,6 +27,8 @@
- {%= doc.get_formatted("grand_total") %} +
+ {%= doc.get_formatted("grand_total_import") %} +
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_list.html b/erpnext/stock/doctype/stock_entry/stock_entry_list.html index cff7fe58ee..21794cfbef 100644 --- a/erpnext/stock/doctype/stock_entry/stock_entry_list.html +++ b/erpnext/stock/doctype/stock_entry/stock_entry_list.html @@ -22,7 +22,9 @@ {%= doc.from_warehouse %} {% } %} - + {% if(doc.from_warehouse || doc.to_warehouse) { %} + + {% } %} {% if(doc.to_warehouse) { %} diff --git a/erpnext/templates/form_grid/material_request_grid.html b/erpnext/templates/form_grid/material_request_grid.html index 6b709d497e..c30cf582d0 100644 --- a/erpnext/templates/form_grid/material_request_grid.html +++ b/erpnext/templates/form_grid/material_request_grid.html @@ -1,5 +1,5 @@ {% var visible_columns = row.get_visible_columns(["item_code", "warehouse", - "item_name", "description", "amount", "stock_uom", "uom", "qty"]); %} + "item_name", "description", "amount", "stock_uom", "uom", "qty", "schedule_date"]); %} {% if(!doc) { %}
@@ -16,7 +16,7 @@ {% include "templates/form_grid/includes/visible_cols.html" %} {% if(doc.schedule_date) { %}
{%= doc.get_formatted("schedule_date") %}