Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4723 from ShashaQin/patch-12

Browse Source 
Stock Reconciliation Improvements
This commit is contained in:
Nabin Hait 2016-02-01 15:38:48 +05:30
commit 767d5e48e7
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
View File

@ -252,21 +252,23 @@ def get_items(warehouse, posting_date, posting_time):
items = frappe.get_list("Bin", fields=["item_code"], filters={"warehouse": warehouse}, as_list=1) items = frappe.get_list("Bin", fields=["item_code"], filters={"warehouse": warehouse}, as_list=1)
items += frappe.get_list("Item", fields=["name"], filters= {"is_stock_item": 1, "has_serial_no": 0, items += frappe.get_list("Item", fields=["name"], filters= {"is_stock_item": 1, "has_serial_no": 0,
"has_batch_no": 0, "has_variants": 0, "default_warehouse": warehouse}, as_list=1) "has_batch_no": 0, "has_variants": 0, "disabled": 0, "default_warehouse": warehouse}, as_list=1)
res = [] res = []
for item in set(items): for item in set(items):
stock_bal = get_stock_balance(item[0], warehouse, posting_date, posting_time, stock_bal = get_stock_balance(item[0], warehouse, posting_date, posting_time,
with_valuation_rate=True) with_valuation_rate=True)
res.append({ if frappe.db.get_value("Item",item[0],"disabled") == 0:
"item_code": item[0],
"warehouse": warehouse, res.append({
"qty": stock_bal[0], "item_code": item[0],
"valuation_rate": stock_bal[1], "warehouse": warehouse,
"current_qty": stock_bal[0], "qty": stock_bal[0],
"current_valuation_rate": stock_bal[1] "valuation_rate": stock_bal[1],
}) "current_qty": stock_bal[0],
"current_valuation_rate": stock_bal[1]
})
return res return res

4
erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
View File

@ -110,7 +110,7 @@
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"description": "", "description": "Do not include symbols (ex. $)",
"fieldname": "valuation_rate", "fieldname": "valuation_rate",
"fieldtype": "Currency", "fieldtype": "Currency",
"hidden": 0, "hidden": 0,
@ -215,7 +215,7 @@
"istable": 1, "istable": 1,
"max_attachments": 0, "max_attachments": 0,
"menu_index": 0, "menu_index": 0,
"modified": "2015-11-30 02:34:10.385030", "modified": "2016-01-27 16:04:42.325454",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Stock Reconciliation Item", "name": "Stock Reconciliation Item",