Merge pull request #3937 from rmehta/purchase-order-fix
[hot] make_stock_entry button in purchase order
diff --git a/erpnext/accounts/report/accounts_payable/accounts_payable.js b/erpnext/accounts/report/accounts_payable/accounts_payable.js
index 2c36e52..9034f3e 100644
--- a/erpnext/accounts/report/accounts_payable/accounts_payable.js
+++ b/erpnext/accounts/report/accounts_payable/accounts_payable.js
@@ -18,7 +18,7 @@
},
{
"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 051328f..d400527 100644
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.js
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.js
@@ -18,7 +18,7 @@
},
{
"fieldname":"report_date",
- "label": __("Date"),
+ "label": __("As on Date"),
"fieldtype": "Date",
"default": get_today()
},
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.js b/erpnext/buying/doctype/purchase_order/purchase_order.js
index a5cd6ce..6ae83d0 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.js
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.js
@@ -32,7 +32,8 @@
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(); });
}
}
diff --git a/erpnext/setup/page/setup_wizard/sample_data.py b/erpnext/setup/page/setup_wizard/sample_data.py
index b90cceb..2cebc91 100644
--- a/erpnext/setup/page/setup_wizard/sample_data.py
+++ b/erpnext/setup/page/setup_wizard/sample_data.py
@@ -12,7 +12,7 @@
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):