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

[optimize] customer outstanding query

Browse Source
This commit is contained in:
Rushabh Mehta 2015-09-25 12:24:10 +05:30
parent ba8ec17f0b
commit b5ff9421e1
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
erpnext/selling/doctype/customer/customer.py
View File

@ -197,27 +197,26 @@ def get_customer_outstanding(customer, company):
outstanding_based_on_so = flt(outstanding_based_on_so[0][0]) if outstanding_based_on_so else 0.0 outstanding_based_on_so = flt(outstanding_based_on_so[0][0]) if outstanding_based_on_so else 0.0
# Outstanding based on Delivery Note # Outstanding based on Delivery Note
outstanding_based_on_dn = frappe.db.sql(""" unmarked_delivery_note_items = frappe.db.sql("""select
select dn_item.name, dn_item.amount, dn.base_net_total, dn.base_grand_total
sum(
(
(ifnull(dn_item.amount, 0) - ifnull((select sum(ifnull(amount, 0))
from `tabSales Invoice Item`
where ifnull(dn_detail, '') = dn_item.name and docstatus = 1), 0)
)/dn.base_net_total
)*dn.base_grand_total
)
from `tabDelivery Note` dn, `tabDelivery Note Item` dn_item from `tabDelivery Note` dn, `tabDelivery Note Item` dn_item
where where
dn.name = dn_item.parent and dn.customer=%s and dn.company=%s dn.name = dn_item.parent
and dn.customer=%s and dn.company=%s
and dn.docstatus = 1 and dn.status != 'Stopped' and dn.docstatus = 1 and dn.status != 'Stopped'
and ifnull(dn_item.against_sales_order, '') = '' and ifnull(dn_item.against_sales_order, '') = ''
and ifnull(dn_item.against_sales_invoice, '') = '' and ifnull(dn_item.against_sales_invoice, '') = ''""", (customer, company), as_dict=True)
and ifnull(dn_item.amount, 0) > ifnull((select sum(ifnull(amount, 0))
from `tabSales Invoice Item`
where ifnull(dn_detail, '') = dn_item.name and docstatus = 1), 0)""", (customer, company))
outstanding_based_on_dn = flt(outstanding_based_on_dn[0][0]) if outstanding_based_on_dn else 0.0 outstanding_based_on_dn = 0.0
for dn_item in unmarked_delivery_note_items:
si_amount = frappe.db.sql("""select sum(ifnull(amount, 0))
from `tabSales Invoice Item`
where dn_detail = %s and docstatus = 1""", dn_item.name)[0][0]
if flt(dn_item.amount) > flt(si_amount):
outstanding_based_on_dn += ((flt(dn_item.amount) - flt(si_amount)) \
/ dn_item.base_net_total) * dn_item.base_grand_total
return outstanding_based_on_gle + outstanding_based_on_so + outstanding_based_on_dn return outstanding_based_on_gle + outstanding_based_on_so + outstanding_based_on_dn

2
erpnext/setup/page/setup_wizard/setup_wizard.py
View File

@ -92,8 +92,10 @@ def setup_account(args=None):
if args.get("add_sample_data"): if args.get("add_sample_data"):
try: try:
make_sample_data() make_sample_data()
frappe.clear_cache()
except FiscalYearError: except FiscalYearError:
pass pass
except: except:
if args: if args:
traceback = frappe.get_traceback() traceback = frappe.get_traceback()