nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-31 10:49:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

[minor] fix to purchase receipt button, make_demo

Browse Source
This commit is contained in:
Rushabh Mehta
2013-08-21 11:19:15 +05:30
parent fe14f69e71
commit 82e54c8293
2 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
stock/doctype/purchase_receipt/purchase_receipt.js
View File

@@ -23,8 +23,7 @@ erpnext.stock.PurchaseReceiptController = erpnext.buying.BuyingController.extend
this.show_stock_ledger(); this.show_stock_ledger();
this.show_general_ledger(); this.show_general_ledger();
} } else {
cur_frm.add_custom_button(wn._('From Purchase Order'), cur_frm.add_custom_button(wn._('From Purchase Order'),
function() { function() {
wn.model.map_current_doc({ wn.model.map_current_doc({
@@ -39,7 +38,7 @@ erpnext.stock.PurchaseReceiptController = erpnext.buying.BuyingController.extend
} }
}) })
}); });
}
if(wn.boot.control_panel.country == 'India') { if(wn.boot.control_panel.country == 'India') {
unhide_field(['challan_no', 'challan_date']); unhide_field(['challan_no', 'challan_date']);

1
utilities/make_demo.py
View File

@@ -216,7 +216,6 @@ def make_stock_entry_from_pro(pro_id, purpose, current_date):
st.doc.fiscal_year = "2010" st.doc.fiscal_year = "2010"
st.doc.expense_adjustment_account = "Stock in Hand - WP" st.doc.expense_adjustment_account = "Stock in Hand - WP"
try: try:
st.run_method("get_items")
st.insert() st.insert()
webnotes.conn.commit() webnotes.conn.commit()
st.submit() st.submit()