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

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Nabin Hait
2013-07-25 16:06:39 +05:30
parent 88e3b92242 dd05d5eca0
commit 54caa86437
9 changed files with 43 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
stock/doctype/stock_reconciliation/stock_reconciliation.js
View File

@@ -108,8 +108,8 @@ erpnext.stock.StockReconciliation = erpnext.stock.StockController.extend({
method: 'stock.doctype.stock_reconciliation.stock_reconciliation.upload'
},
sample_url: "e.g. http://example.com/somefile.csv",
callback: function(r) {
me.frm.set_value("reconciliation_json", JSON.stringify(r));
callback: function(fid, filename, r) {
me.frm.set_value("reconciliation_json", JSON.stringify(r.message));
me.show_reconciliation_data();
me.frm.save();
}

6
stock/page/stock_home/stock_home.js
View File

@@ -203,23 +203,27 @@ wn.module_page["Stock"] = [
{
"label":wn._("Purchase In Transit"),
route: "query-report/Purchase In Transit",
doctype: "Purchase Order"
},
{
"label":wn._("Requested Items To Be Transferred"),
route: "query-report/Requested Items To Be Transferred",
doctype: "Material Request"
},
{
"label":wn._("Batch-Wise Balance History"),
route: "query-report/Batch-Wise Balance History",
doctype: "Batch"
},
{
"label":wn._("Warehouse-Wise Stock Balance"),
route: "query-report/Warehouse-Wise Stock Balance",
doctype: "Warehouse"
},
{
"label":wn._("Item Prices"),
route: "query-report/Item Prices",
doctype: "Price List"
},
{
"label":wn._("Itemwise Recommended Reorder Level"),