nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-02 03:39:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes: show deducted tax in purchase register

Browse Source
This commit is contained in:
Nabin Hait
2013-03-26 17:44:00 +05:30
parent 808b085057
commit 88eb328622
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,14 +77,10 @@ for r in res:
r.append(net_total) r.append(net_total)
#Get tax for account heads #Get tax for account heads
acc_head_tax = sql("""select account_head, sum(tax_amount) acc_head_tax = sql("""select account_head,
from `tabPurchase Taxes and Charges` sum(if(add_deduct_tax='Add', tax_amount, -tax_amount))
where parent = '%s' from `tabPurchase Taxes and Charges` where parent = %s and parenttype = 'Purchase Invoice'
and parenttype = 'Purchase Invoice' and category in ('Total', 'Valuation and Total') group by account_head""", r[col_idx['ID']])
and add_deduct_tax = 'Add'
and category in ('Total', 'Valuation and Total')
group by account_head
""" %(r[col_idx['ID']],))
#Convert the result to dictionary for easy retrieval #Convert the result to dictionary for easy retrieval
acc_head_tax_dict = {} acc_head_tax_dict = {}