nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-03 12:19:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
[hot] make_stock_entry button in purchase order
This commit is contained in:
Anand Doshi
2015-08-24 14:41:40 +05:30
parent 50e2e1d9af da24698cf7
commit d092fd918a
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/report/accounts_payable/accounts_payable.js
View File

@@ -18,7 +18,7 @@ frappe.query_reports["Accounts Payable"] = {
}, },
{ {
"fieldname":"report_date", "fieldname":"report_date",
"label": __("Date"), "label": __("As on Date"),
"fieldtype": "Date", "fieldtype": "Date",
"default": get_today() "default": get_today()
}, },

2
erpnext/accounts/report/accounts_receivable/accounts_receivable.js
View File

@@ -18,7 +18,7 @@ frappe.query_reports["Accounts Receivable"] = {
}, },
{ {
"fieldname":"report_date", "fieldname":"report_date",
"label": __("Date"), "label": __("As on Date"),
"fieldtype": "Date", "fieldtype": "Date",
"default": get_today() "default": get_today()
}, },

3
erpnext/buying/doctype/purchase_order/purchase_order.js
View File

@@ -32,7 +32,8 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend(
cur_frm.add_custom_button(__('Receive'), this.make_purchase_receipt).addClass("btn-primary"); cur_frm.add_custom_button(__('Receive'), this.make_purchase_receipt).addClass("btn-primary");
if(doc.is_subcontracted==="Yes") { 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(); });
} }
} }

2
erpnext/setup/page/setup_wizard/sample_data.py
View File

@@ -12,7 +12,7 @@ def make_sample_data():
to help the user get started""" to help the user get started"""
selling_items = frappe.get_all("Item", filters = {"is_sales_item": 1}) 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: if selling_items:
for i in range(3): for i in range(3):