From 29517d0b8c7f0368b1fe34d5040c8ff31ac128ab Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 22 Jul 2016 13:25:33 +0530 Subject: [PATCH] [fix] purchase order dashboard --- .../purchase_order/purchase_order_dashboard.py | 16 ++++++++++++++-- .../doctype/material_request/material_request.js | 4 ++-- .../material_request_dashboard.py | 1 - 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py b/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py index 0812790350..61a9700eba 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py +++ b/erpnext/buying/doctype/purchase_order/purchase_order_dashboard.py @@ -1,12 +1,24 @@ from frappe import _ data = { - 'docstatus': 1, 'fieldname': 'purchase_order', + 'internal_links': { + 'Material Request': ['items', 'material_request'], + 'Supplier Quotation': ['items', 'supplier_quotation'], + 'Project': ['project'], + }, 'transactions': [ { 'label': _('Related'), - 'items': ['Purchase Receipt', 'Purchase Invoice', 'Stock Entry'] + 'items': ['Purchase Receipt', 'Purchase Invoice'] + }, + { + 'label': _('Reference'), + 'items': ['Material Request', 'Supplier Quotation', 'Project'] + }, + { + 'label': _('Sub-contracting'), + 'items': ['Stock Entry'] }, ] } \ No newline at end of file diff --git a/erpnext/stock/doctype/material_request/material_request.js b/erpnext/stock/doctype/material_request/material_request.js index 62ae091162..28817cc25d 100644 --- a/erpnext/stock/doctype/material_request/material_request.js +++ b/erpnext/stock/doctype/material_request/material_request.js @@ -79,7 +79,7 @@ erpnext.buying.MaterialRequestController = erpnext.buying.BuyingController.exten // stop cur_frm.add_custom_button(__('Stop'), - cur_frm.cscript['Stop Material Request'], __("Status")); + cur_frm.cscript['Stop Material Request']); } } @@ -102,7 +102,7 @@ erpnext.buying.MaterialRequestController = erpnext.buying.BuyingController.exten if(doc.docstatus == 1 && doc.status == 'Stopped') cur_frm.add_custom_button(__('Re-open'), - cur_frm.cscript['Unstop Material Request'], __("Status")); + cur_frm.cscript['Unstop Material Request']); }, diff --git a/erpnext/stock/doctype/material_request/material_request_dashboard.py b/erpnext/stock/doctype/material_request/material_request_dashboard.py index da6790d1d7..8547df18c1 100644 --- a/erpnext/stock/doctype/material_request/material_request_dashboard.py +++ b/erpnext/stock/doctype/material_request/material_request_dashboard.py @@ -1,7 +1,6 @@ from frappe import _ data = { - 'docstatus': 1, 'fieldname': 'material_request', 'transactions': [ {