From c8a5a2cc4acebe8b92fea60b50b5fcbba7dc4e05 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 24 Aug 2015 13:12:45 +0530 Subject: [PATCH 1/3] [hot] make_stock_entry button in purchase order --- erpnext/buying/doctype/purchase_order/purchase_order.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js index a5cd6ce6c2a..6ae83d0f00b 100644 --- a/erpnext/buying/doctype/purchase_order/purchase_order.js +++ b/erpnext/buying/doctype/purchase_order/purchase_order.js @@ -32,7 +32,8 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend( cur_frm.add_custom_button(__('Receive'), this.make_purchase_receipt).addClass("btn-primary"); if(doc.is_subcontracted==="Yes") { - cur_frm.add_custom_button(__('Transfer Material to Supplier'), this.make_stock_entry); + cur_frm.add_custom_button(__('Transfer Material to Supplier'), + function() { me.make_stock_entry(); }); } } From d999dd1bb941c3300d28b65f8df1c2f6ec71d9d8 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 24 Aug 2015 14:23:55 +0530 Subject: [PATCH 2/3] [minor] fix setup wizard buying_items query --- erpnext/setup/page/setup_wizard/sample_data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/setup/page/setup_wizard/sample_data.py b/erpnext/setup/page/setup_wizard/sample_data.py index b90cceb589f..2cebc9148bb 100644 --- a/erpnext/setup/page/setup_wizard/sample_data.py +++ b/erpnext/setup/page/setup_wizard/sample_data.py @@ -12,7 +12,7 @@ def make_sample_data(): to help the user get started""" selling_items = frappe.get_all("Item", filters = {"is_sales_item": 1}) - buying_items = frappe.get_all("Item", filters = {"is_sales_item": 0}) + buying_items = frappe.get_all("Item", filters = {"is_purchase_item": 1}) if selling_items: for i in range(3): From da24698cf74a3b2b248ef60d1c8e3abb9ec6b1cc Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 24 Aug 2015 14:31:07 +0530 Subject: [PATCH 3/3] [minor] in ap, ar renamed label for date as 'as on date' as it was confusing --- erpnext/accounts/report/accounts_payable/accounts_payable.js | 2 +- .../accounts/report/accounts_receivable/accounts_receivable.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/report/accounts_payable/accounts_payable.js b/erpnext/accounts/report/accounts_payable/accounts_payable.js index 2c36e522a17..9034f3e3b49 100644 --- a/erpnext/accounts/report/accounts_payable/accounts_payable.js +++ b/erpnext/accounts/report/accounts_payable/accounts_payable.js @@ -18,7 +18,7 @@ frappe.query_reports["Accounts Payable"] = { }, { "fieldname":"report_date", - "label": __("Date"), + "label": __("As on Date"), "fieldtype": "Date", "default": get_today() }, diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.js b/erpnext/accounts/report/accounts_receivable/accounts_receivable.js index 051328f27ec..d400527116c 100644 --- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.js +++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.js @@ -18,7 +18,7 @@ frappe.query_reports["Accounts Receivable"] = { }, { "fieldname":"report_date", - "label": __("Date"), + "label": __("As on Date"), "fieldtype": "Date", "default": get_today() },