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

Valuation Rate column in Stock Ledger report. Fixed #1633

Browse Source
This commit is contained in:
Nabin Hait 2014-05-15 11:50:46 +05:30
parent bc7659ab90
commit b5a8cab8df
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
erpnext/stock/report/stock_ledger/stock_ledger.py
View File

@ -8,32 +8,32 @@ def execute(filters=None):
columns = get_columns() columns = get_columns()
sl_entries = get_stock_ledger_entries(filters) sl_entries = get_stock_ledger_entries(filters)
item_details = get_item_details(filters) item_details = get_item_details(filters)
data = [] data = []
for sle in sl_entries: for sle in sl_entries:
item_detail = item_details[sle.item_code] item_detail = item_details[sle.item_code]
voucher_link_icon = """<a href="%s"><i class="icon icon-share" voucher_link_icon = """<a href="%s"><i class="icon icon-share"
style="cursor: pointer;"></i></a>""" \ style="cursor: pointer;"></i></a>""" \
% ("/".join(["#Form", sle.voucher_type, sle.voucher_no]),) % ("/".join(["#Form", sle.voucher_type, sle.voucher_no]),)
data.append([sle.date, sle.item_code, item_detail.item_name, item_detail.item_group, data.append([sle.date, sle.item_code, item_detail.item_name, item_detail.item_group,
item_detail.brand, item_detail.description, sle.warehouse, item_detail.stock_uom, item_detail.brand, item_detail.description, sle.warehouse, item_detail.stock_uom,
sle.actual_qty, sle.qty_after_transaction, sle.stock_value, sle.voucher_type, sle.actual_qty, sle.qty_after_transaction, sle.valuation_rate, sle.stock_value,
sle.voucher_no, voucher_link_icon, sle.batch_no, sle.serial_no, sle.company]) sle.voucher_type, sle.voucher_no, voucher_link_icon, sle.batch_no, sle.serial_no, sle.company])
return columns, data return columns, data
def get_columns(): def get_columns():
return ["Date:Datetime:95", "Item:Link/Item:100", "Item Name::100", return ["Date:Datetime:95", "Item:Link/Item:130", "Item Name::100",
"Item Group:Link/Item Group:100", "Brand:Link/Brand:100", "Item Group:Link/Item Group:100", "Brand:Link/Brand:100",
"Description::200", "Warehouse:Link/Warehouse:100", "Description::200", "Warehouse:Link/Warehouse:100",
"Stock UOM:Link/UOM:100", "Qty:Float:50", "Balance Qty:Float:80", "Stock UOM:Link/UOM:100", "Qty:Float:50", "Balance Qty:Float:100", "Valuation Rate:Currency:110",
"Balance Value:Currency:100", "Voucher Type::100", "Voucher #::100", "Link::30", "Balance Value:Currency:110", "Voucher Type::110", "Voucher #::100", "Link::30",
"Batch:Link/Batch:100", "Serial #:Link/Serial No:100", "Company:Link/Company:100"] "Batch:Link/Batch:100", "Serial #:Link/Serial No:100", "Company:Link/Company:100"]
def get_stock_ledger_entries(filters): def get_stock_ledger_entries(filters):
return frappe.db.sql("""select concat_ws(" ", posting_date, posting_time) as date, return frappe.db.sql("""select concat_ws(" ", posting_date, posting_time) as date,
item_code, warehouse, actual_qty, qty_after_transaction, item_code, warehouse, actual_qty, qty_after_transaction, valuation_rate,
stock_value, voucher_type, voucher_no, batch_no, serial_no, company stock_value, voucher_type, voucher_no, batch_no, serial_no, company
from `tabStock Ledger Entry` from `tabStock Ledger Entry`
where company = %(company)s and where company = %(company)s and
@ -44,31 +44,31 @@ def get_stock_ledger_entries(filters):
def get_item_details(filters): def get_item_details(filters):
item_details = {} item_details = {}
for item in frappe.db.sql("""select name, item_name, description, item_group, for item in frappe.db.sql("""select name, item_name, description, item_group,
brand, stock_uom from `tabItem` {item_conditions}"""\ brand, stock_uom from `tabItem` {item_conditions}"""\
.format(item_conditions=get_item_conditions(filters)), filters, as_dict=1): .format(item_conditions=get_item_conditions(filters)), filters, as_dict=1):
item_details.setdefault(item.name, item) item_details.setdefault(item.name, item)
return item_details return item_details
def get_item_conditions(filters): def get_item_conditions(filters):
conditions = [] conditions = []
if filters.get("item_code"): if filters.get("item_code"):
conditions.append("name=%(item_code)s") conditions.append("name=%(item_code)s")
if filters.get("brand"): if filters.get("brand"):
conditions.append("brand=%(brand)s") conditions.append("brand=%(brand)s")
return "where {}".format(" and ".join(conditions)) if conditions else "" return "where {}".format(" and ".join(conditions)) if conditions else ""
def get_sle_conditions(filters): def get_sle_conditions(filters):
conditions = [] conditions = []
item_conditions=get_item_conditions(filters) item_conditions=get_item_conditions(filters)
if item_conditions: if item_conditions:
conditions.append("""item_code in (select name from tabItem conditions.append("""item_code in (select name from tabItem
{item_conditions})""".format(item_conditions=item_conditions)) {item_conditions})""".format(item_conditions=item_conditions))
if filters.get("warehouse"): if filters.get("warehouse"):
conditions.append("warehouse=%(warehouse)s") conditions.append("warehouse=%(warehouse)s")
if filters.get("voucher_no"): if filters.get("voucher_no"):
conditions.append("voucher_no=%(voucher_no)s") conditions.append("voucher_no=%(voucher_no)s")
return "and {}".format(" and ".join(conditions)) if conditions else "" return "and {}".format(" and ".join(conditions)) if conditions else ""