nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-22 06:29:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Taxes and charges category issue fixed

Browse Source
This commit is contained in:
Nabin Hait
2012-10-03 11:54:06 +05:30
parent cd2f40ffef
commit 9462ce9aef
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
accounts/doctype/gl_control/gl_control.py
View File

@@ -182,7 +182,7 @@ class DocType:
if le_map['table_field']:
for d in getlist(doclist,le_map['table_field']):
# purchase_tax_details is the table of other charges in purchase cycle
if le_map['table_field'] != 'purchase_tax_details' or (le_map['table_field'] == 'purchase_tax_details' and d.fields.get('category') != 'For Valuation'):
if le_map['table_field'] != 'purchase_tax_details' or (le_map['table_field'] == 'purchase_tax_details' and d.fields.get('category') != 'Valuation'):
self.make_single_entry(doc,d,le_map,cancel, merge_entries)
else:
self.make_single_entry(None,doc,le_map,cancel, merge_entries)

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

@@ -37,7 +37,7 @@ tax_acc = [c[0] for c in sql("""select distinct account_head
from `tabPurchase Taxes and Charges`
where parenttype = 'Purchase Invoice'
and add_deduct_tax = 'Add'
and category in ('For Total', 'For Both')
and category in ('Total', 'Valuation and Total')
and docstatus=1
order by account_head asc""")]
@@ -82,7 +82,7 @@ for r in res:
where parent = '%s'
and parenttype = 'Purchase Invoice'
and add_deduct_tax = 'Add'
and category in ('For Total', 'For Both')
and category in ('Total', 'Valuation and Total')
group by account_head
""" %(r[col_idx['ID']],))