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

[fix] stock qty issue in purchase trends report

Browse Source
This commit is contained in:
Rohit Waghchaure 2017-04-04 11:35:22 +05:30 committed by Nabin Hait
parent 08a42e00ae
commit faf51d91b6
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
erpnext/controllers/trends.py
View File

@ -140,16 +140,20 @@ def period_wise_columns_query(filters, trans):
else: else:
trans_date = 'transaction_date' trans_date = 'transaction_date'
qty_field = "t2.stock_qty"
if trans == 'Purchase Invoice':
qty_field = "t2.qty"
if filters.get("period") != 'Yearly': if filters.get("period") != 'Yearly':
for dt in bet_dates: for dt in bet_dates:
get_period_wise_columns(dt, filters.get("period"), pwc) get_period_wise_columns(dt, filters.get("period"), pwc)
query_details = get_period_wise_query(dt, trans_date, query_details) query_details = get_period_wise_query(dt, trans_date, query_details, qty_field)
else: else:
pwc = [_(filters.get("fiscal_year")) + " ("+_("Qty") + "):Float:120", pwc = [_(filters.get("fiscal_year")) + " ("+_("Qty") + "):Float:120",
_(filters.get("fiscal_year")) + " ("+ _("Amt") + "):Currency:120"] _(filters.get("fiscal_year")) + " ("+ _("Amt") + "):Currency:120"]
query_details = " SUM(t2.stock_qty), SUM(t2.base_net_amount)," query_details = " SUM(%s), SUM(t2.base_net_amount),"%(qty_field)
query_details += 'SUM(t2.stock_qty), SUM(t2.base_net_amount)' query_details += 'SUM(%s), SUM(t2.base_net_amount)'%(qty_field)
return pwc, query_details return pwc, query_details
def get_period_wise_columns(bet_dates, period, pwc): def get_period_wise_columns(bet_dates, period, pwc):
@ -160,10 +164,10 @@ def get_period_wise_columns(bet_dates, period, pwc):
pwc += [_(get_mon(bet_dates[0])) + "-" + _(get_mon(bet_dates[1])) + " (" + _("Qty") + "):Float:120", pwc += [_(get_mon(bet_dates[0])) + "-" + _(get_mon(bet_dates[1])) + " (" + _("Qty") + "):Float:120",
_(get_mon(bet_dates[0])) + "-" + _(get_mon(bet_dates[1])) + " (" + _("Amt") + "):Currency:120"] _(get_mon(bet_dates[0])) + "-" + _(get_mon(bet_dates[1])) + " (" + _("Amt") + "):Currency:120"]
def get_period_wise_query(bet_dates, trans_date, query_details): def get_period_wise_query(bet_dates, trans_date, query_details, qty_field):
query_details += """SUM(IF(t1.%(trans_date)s BETWEEN '%(sd)s' AND '%(ed)s', t2.stock_qty, NULL)), query_details += """SUM(IF(t1.%(trans_date)s BETWEEN '%(sd)s' AND '%(ed)s', %(qty_field)s, NULL)),
SUM(IF(t1.%(trans_date)s BETWEEN '%(sd)s' AND '%(ed)s', t2.base_net_amount, NULL)), SUM(IF(t1.%(trans_date)s BETWEEN '%(sd)s' AND '%(ed)s', t2.base_net_amount, NULL)),
""" % {"trans_date": trans_date, "sd": bet_dates[0],"ed": bet_dates[1]} """ % {"trans_date": trans_date, "sd": bet_dates[0],"ed": bet_dates[1], "qty_field": qty_field}
return query_details return query_details
@frappe.whitelist(allow_guest=True) @frappe.whitelist(allow_guest=True)