mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-26 00:14:50 +00:00
[reports] general ledger: grid report to script report
This commit is contained in:
@@ -20,8 +20,8 @@ def execute(filters=None):
|
||||
earliest_age = date_diff(to_date, fifo_queue[0][1])
|
||||
latest_age = date_diff(to_date, fifo_queue[-1][1])
|
||||
|
||||
data.append([item, details.item_name, details.description, details.brand,
|
||||
average_age, earliest_age, latest_age, details.stock_uom])
|
||||
data.append([item, details.item_name, details.description, details.item_group,
|
||||
details.brand, average_age, earliest_age, latest_age, details.stock_uom])
|
||||
|
||||
return columns, data
|
||||
|
||||
@@ -36,8 +36,8 @@ def get_average_age(fifo_queue, to_date):
|
||||
|
||||
def get_columns():
|
||||
return ["Item Code:Link/Item:100", "Item Name::100", "Description::200",
|
||||
"Brand:Link/Brand:100", "Average Age:Float:100", "Earliest:Int:80",
|
||||
"Latest:Int:80", "UOM:Link/UOM:100"]
|
||||
"Item Group:Link/Item Group:100", "Brand:Link/Brand:100", "Average Age:Float:100",
|
||||
"Earliest:Int:80", "Latest:Int:80", "UOM:Link/UOM:100"]
|
||||
|
||||
def get_fifo_queue(filters):
|
||||
item_details = {}
|
||||
@@ -64,7 +64,8 @@ def get_fifo_queue(filters):
|
||||
|
||||
def get_stock_ledger_entries(filters):
|
||||
return webnotes.conn.sql("""select
|
||||
item.name, item.item_name, brand, description, item.stock_uom, actual_qty, posting_date
|
||||
item.name, item.item_name, item_group, brand, description, item.stock_uom,
|
||||
actual_qty, posting_date
|
||||
from `tabStock Ledger Entry` sle,
|
||||
(select name, item_name, description, stock_uom, brand
|
||||
from `tabItem` {item_conditions}) item
|
||||
|
||||
@@ -8,13 +8,14 @@ def execute(filters=None):
|
||||
columns = get_columns()
|
||||
|
||||
data = webnotes.conn.sql("""select
|
||||
item.name, item.item_name, description, brand, warehouse, item.stock_uom,
|
||||
item.name, item.item_name, description, item_group, brand, warehouse, item.stock_uom,
|
||||
actual_qty, planned_qty, indented_qty, ordered_qty, reserved_qty,
|
||||
projected_qty, item.re_order_level, item.re_order_qty
|
||||
from `tabBin` bin,
|
||||
(select name, company from tabWarehouse
|
||||
where company=%(company)s {warehouse_conditions}) wh,
|
||||
(select name, item_name, description, stock_uom, brand, re_order_level, re_order_qty
|
||||
(select name, item_name, description, stock_uom, item_group,
|
||||
brand, re_order_level, re_order_qty
|
||||
from `tabItem` {item_conditions}) item
|
||||
where item_code = item.name and warehouse = wh.name
|
||||
order by item.name, wh.name"""\
|
||||
|
||||
Reference in New Issue
Block a user