mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-30 18:34:48 +00:00
[Reports][Validation changes in Purchase and Sales trends]
This commit is contained in:
@@ -27,8 +27,8 @@ def execute(filters=None):
|
|||||||
|
|
||||||
details = get_columns(filters, trans)
|
details = get_columns(filters, trans)
|
||||||
data = get_data(filters, tab, details)
|
data = get_data(filters, tab, details)
|
||||||
|
|
||||||
if data == '':
|
if not data :
|
||||||
webnotes.msgprint("Data Not Available")
|
webnotes.msgprint("Data not found for selected criterias")
|
||||||
|
|
||||||
return details["columns"], data
|
return details["columns"], data
|
||||||
@@ -107,6 +107,7 @@ def get_invoices(filters):
|
|||||||
from `tabPurchase Invoice` where docstatus = 1 %s
|
from `tabPurchase Invoice` where docstatus = 1 %s
|
||||||
order by posting_date desc, name desc""" % conditions, filters, as_dict=1)
|
order by posting_date desc, name desc""" % conditions, filters, as_dict=1)
|
||||||
|
|
||||||
|
|
||||||
def get_invoice_expense_map(invoice_list):
|
def get_invoice_expense_map(invoice_list):
|
||||||
expense_details = webnotes.conn.sql("""select parent, expense_head, sum(amount) as amount
|
expense_details = webnotes.conn.sql("""select parent, expense_head, sum(amount) as amount
|
||||||
from `tabPurchase Invoice Item` where parent in (%s) group by parent, expense_head""" %
|
from `tabPurchase Invoice Item` where parent in (%s) group by parent, expense_head""" %
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ def execute(filters=None):
|
|||||||
details = get_columns(filters, trans)
|
details = get_columns(filters, trans)
|
||||||
data = get_data(filters, tab, details)
|
data = get_data(filters, tab, details)
|
||||||
|
|
||||||
if data == '':
|
if not data :
|
||||||
webnotes.msgprint("Data Not Available")
|
webnotes.msgprint("Data not found for selected criterias")
|
||||||
|
|
||||||
return details["columns"], data
|
return details["columns"], data
|
||||||
@@ -28,7 +28,7 @@ def execute(filters=None):
|
|||||||
details = get_columns(filters, trans)
|
details = get_columns(filters, trans)
|
||||||
data = get_data(filters, tab, details)
|
data = get_data(filters, tab, details)
|
||||||
|
|
||||||
if data == '':
|
if not data :
|
||||||
webnotes.msgprint("Data Not Available")
|
webnotes.msgprint("Data not found for selected criterias")
|
||||||
|
|
||||||
return details["columns"], data
|
return details["columns"], data
|
||||||
@@ -28,7 +28,7 @@ def execute(filters=None):
|
|||||||
details = get_columns(filters, trans)
|
details = get_columns(filters, trans)
|
||||||
data = get_data(filters, tab, details)
|
data = get_data(filters, tab, details)
|
||||||
|
|
||||||
if data == '':
|
if not data:
|
||||||
webnotes.msgprint("Data Not Available")
|
webnotes.msgprint("Data not found for selected criterias")
|
||||||
|
|
||||||
return details["columns"], data
|
return details["columns"], data
|
||||||
@@ -28,7 +28,7 @@ def execute(filters=None):
|
|||||||
details = get_columns(filters, trans)
|
details = get_columns(filters, trans)
|
||||||
data = get_data(filters, tab, details)
|
data = get_data(filters, tab, details)
|
||||||
|
|
||||||
if data == '':
|
if not data :
|
||||||
webnotes.msgprint("Data Not Available")
|
webnotes.msgprint("Data not found for selected criterias")
|
||||||
|
|
||||||
return details["columns"], data
|
return details["columns"], data
|
||||||
@@ -28,7 +28,7 @@ def execute(filters=None):
|
|||||||
details = get_columns(filters, trans)
|
details = get_columns(filters, trans)
|
||||||
data = get_data(filters, tab, details)
|
data = get_data(filters, tab, details)
|
||||||
|
|
||||||
if data == '':
|
if not data :
|
||||||
webnotes.msgprint("Data Not Available")
|
webnotes.msgprint("Data not found for selected criterias")
|
||||||
|
|
||||||
return details["columns"], data
|
return details["columns"], data
|
||||||
@@ -28,7 +28,7 @@ def execute(filters=None):
|
|||||||
details = get_columns(filters, trans)
|
details = get_columns(filters, trans)
|
||||||
data = get_data(filters, tab, details)
|
data = get_data(filters, tab, details)
|
||||||
|
|
||||||
if data == '':
|
if not data :
|
||||||
webnotes.msgprint("Data Not Available")
|
webnotes.msgprint("Data not found for selected criterias")
|
||||||
|
|
||||||
return details["columns"], data
|
return details["columns"], data
|
||||||
Reference in New Issue
Block a user