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

Changed query to make it more efficient

Browse Source
This commit is contained in:
Anand Doshi
2011-06-27 16:30:29 +05:30
parent c0d6502c9f
commit f295f212b1
2 changed files with 82 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
accounts/search_criteria/purchase_register/purchase_register.py
View File

@@ -14,14 +14,13 @@ for i in expense_acc:
coloptions.append('')
# Add tax head columns
tax_acc = [c[0] for c in sql("select distinct account_head from `tabPurchase Tax Detail` where parenttype='Payable Voucher' and category in ('For Total', 'For Both') and add_deduct_tax = 'Add' and docstatus=1 order by idx asc")]
"""select distinct account_head
from `tabPurchase Tax Detail`
where parenttype = 'Payable Voucher'
and add_deduct_tax = 'Add'
and category != 'For Valuation'
order by account_head asc"""
tax_acc = [c[0] for c in sql("""select distinct account_head
from `tabPurchase Tax Detail`
where parenttype = 'Payable Voucher'
and add_deduct_tax = 'Add'
and category in ('For Total', 'For Both')
and docstatus=1
order by account_head asc""")]
tax_acc.append('Total Tax')
tax_acc.append('GrandTotal')
@@ -69,12 +68,12 @@ for r in res:
#Get tax for account heads
acc_head_tax = sql("""select account_head, tax_amount
from `tabPurchase Tax Detail`
where parent = '%s'
and parenttype = 'Payable Voucher'
and add_deduct_tax = 'Add'
and category in ('For Total', 'For Both')""" %(r[col_idx['ID']],))
from `tabPurchase Tax Detail`
where parent = '%s'
and parenttype = 'Payable Voucher'
and add_deduct_tax = 'Add'
and category in ('For Total', 'For Both')""" %(r[col_idx['ID']],))
#Convert the result to dictionary for easy retrieval
acc_head_tax_dict = {}
for a in acc_head_tax: