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

fixed stock_balance report for stock_uom and stock ledger entry for Delivery Note #2802

Browse Source
This commit is contained in:
Sambhaji Kolate 2015-02-20 13:09:39 +05:30
parent 5aa465ae44
commit 973f78e7d3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/controllers/selling_controller.py
View File

@ -391,6 +391,7 @@ class SellingController(StockController):
'qty': d.qty, 'qty': d.qty,
'reserved_qty': reserved_qty_for_main_item, 'reserved_qty': reserved_qty_for_main_item,
'uom': d.stock_uom, 'uom': d.stock_uom,
'stock_uom': d.stock_uom,
'batch_no': cstr(d.get("batch_no")).strip(), 'batch_no': cstr(d.get("batch_no")).strip(),
'serial_no': cstr(d.get("serial_no")).strip(), 'serial_no': cstr(d.get("serial_no")).strip(),
'name': d.name 'name': d.name

9
erpnext/stock/report/stock_balance/stock_balance.py
View File

@ -22,7 +22,7 @@ def execute(filters=None):
item_map[item]["item_group"], item_map[item]["item_group"],
item_map[item]["brand"], item_map[item]["brand"],
item_map[item]["description"], wh, item_map[item]["description"], wh,
qty_dict.uom, qty_dict.opening_qty, item_map[item]["stock_uom"], qty_dict.opening_qty,
qty_dict.opening_val, qty_dict.in_qty, qty_dict.opening_val, qty_dict.in_qty,
qty_dict.in_val, qty_dict.out_qty, qty_dict.in_val, qty_dict.out_qty,
qty_dict.out_val, qty_dict.bal_qty, qty_dict.out_val, qty_dict.bal_qty,
@ -36,7 +36,7 @@ def get_columns(filters):
"""return columns based on filters""" """return columns based on filters"""
columns = ["Item:Link/Item:100", "Item Name::150", "Item Group::100", "Brand::90", \ columns = ["Item:Link/Item:100", "Item Name::150", "Item Group::100", "Brand::90", \
"Description::140", "Warehouse:Link/Warehouse:100", "Stock UOM::90", "Opening Qty:Float:100", \ "Description::140", "Warehouse:Link/Warehouse:100", "Stock UOM:Link/UOM:90", "Opening Qty:Float:100", \
"Opening Value:Float:110", "In Qty:Float:80", "In Value:Float:80", "Out Qty:Float:80", \ "Opening Value:Float:110", "In Qty:Float:80", "In Value:Float:80", "Out Qty:Float:80", \
"Out Value:Float:80", "Balance Qty:Float:100", "Balance Value:Float:100", \ "Out Value:Float:80", "Balance Qty:Float:100", "Balance Value:Float:100", \
"Valuation Rate:Float:90", "Company:Link/Company:100"] "Valuation Rate:Float:90", "Company:Link/Company:100"]
@ -59,7 +59,7 @@ def get_conditions(filters):
def get_stock_ledger_entries(filters): def get_stock_ledger_entries(filters):
conditions = get_conditions(filters) conditions = get_conditions(filters)
return frappe.db.sql("""select item_code, warehouse, posting_date, actual_qty, valuation_rate, return frappe.db.sql("""select item_code, warehouse, posting_date, actual_qty, valuation_rate,
stock_uom, company, voucher_type, qty_after_transaction, stock_value_difference company, voucher_type, qty_after_transaction, stock_value_difference
from `tabStock Ledger Entry` from `tabStock Ledger Entry`
where docstatus < 2 %s order by posting_date, posting_time, name""" % where docstatus < 2 %s order by posting_date, posting_time, name""" %
conditions, as_dict=1) conditions, as_dict=1)
@ -78,7 +78,6 @@ def get_item_warehouse_map(filters):
"val_rate": 0.0, "uom": None "val_rate": 0.0, "uom": None
})) }))
qty_dict = iwb_map[d.company][d.item_code][d.warehouse] qty_dict = iwb_map[d.company][d.item_code][d.warehouse]
qty_dict.uom = d.stock_uom
if d.voucher_type == "Stock Reconciliation": if d.voucher_type == "Stock Reconciliation":
qty_diff = flt(d.qty_after_transaction) - qty_dict.bal_qty qty_diff = flt(d.qty_after_transaction) - qty_dict.bal_qty
@ -106,7 +105,7 @@ def get_item_warehouse_map(filters):
def get_item_details(filters): def get_item_details(filters):
item_map = {} item_map = {}
for d in frappe.db.sql("select name, item_name, item_group, brand, \ for d in frappe.db.sql("select name, item_name, stock_uom, item_group, brand, \
description from tabItem", as_dict=1): description from tabItem", as_dict=1):
item_map.setdefault(d.name, d) item_map.setdefault(d.name, d)