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

Merge pull request #1218 from nabinhait/hotfix

Browse Source 
Opening and closing balance in general ledger report
This commit is contained in:
Nabin Hait
2013-12-19 05:48:07 -08:00
parent 4764f3ea1d 2a9e4e9a32
commit 2ffba327ac
5 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
stock/report/stock_ledger/stock_ledger.py
View File

@@ -13,10 +13,14 @@ def execute(filters=None):
data = []
for sle in sl_entries:
item_detail = item_details[sle.item_code]
voucher_link_icon = """<a href="%s"><i class="icon icon-share"
style="cursor: pointer;"></i></a>""" \
% ("/".join(["#Form", sle.voucher_type, sle.voucher_no]),)
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,
sle.actual_qty, sle.qty_after_transaction, sle.stock_value, sle.voucher_type,
sle.voucher_no, sle.batch_no, sle.serial_no, sle.company])
sle.voucher_no, voucher_link_icon, sle.batch_no, sle.serial_no, sle.company])
return columns, data
@@ -25,7 +29,7 @@ def get_columns():
"Item Group:Link/Item Group:100", "Brand:Link/Brand:100",
"Description::200", "Warehouse:Link/Warehouse:100",
"Stock UOM:Link/UOM:100", "Qty:Float:50", "Balance Qty:Float:80",
"Balance Value:Currency:100", "Voucher Type::100", "Voucher #::100",
"Balance Value:Currency:100", "Voucher Type::100", "Voucher #::100", "Link::30",
"Batch:Link/Batch:100", "Serial #:Link/Serial No:100", "Company:Link/Company:100"]
def get_stock_ledger_entries(filters):

2
stock/report/stock_projected_qty/stock_projected_qty.py
View File

@@ -20,7 +20,7 @@ def execute(filters=None):
where item_code = item.name and warehouse = wh.name
order by item.name, wh.name"""\
.format(item_conditions=get_item_conditions(filters),
warehouse_conditions=get_warehouse_conditions(filters)), filters, debug=1)
warehouse_conditions=get_warehouse_conditions(filters)), filters)
return columns, data