Merge pull request #3937 from rmehta/purchase-order-fix

[hot] make_stock_entry button in purchase order

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()
 		},

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()
 		},

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(); });
 				}
 			}
 

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):