From 0480153042780a876a097c7405a47792a2d959d4 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Tue, 19 Jun 2012 18:07:03 +0530 Subject: [PATCH] error fixed in sales register --- .../purchase_register/purchase_register.py | 3 ++- .../sales_register/sales_register.py | 26 ++++++------------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/erpnext/accounts/search_criteria/purchase_register/purchase_register.py b/erpnext/accounts/search_criteria/purchase_register/purchase_register.py index 5f26d76ba9..bb58d77bbc 100644 --- a/erpnext/accounts/search_criteria/purchase_register/purchase_register.py +++ b/erpnext/accounts/search_criteria/purchase_register/purchase_register.py @@ -15,6 +15,8 @@ # along with this program. If not, see . # add expense head columns +from webnotes.utils import flt, cint, cstr + expense_acc = [c[0] for c in sql("""select distinct expense_head from `tabPurchase Invoice Item` where parenttype='Purchase Invoice' @@ -90,7 +92,6 @@ for r in res: # get tax amount total_tax = 0 - grand_total = 0 for c in tax_acc: val = acc_head_tax_dict.get(c, 0) total_tax += val diff --git a/erpnext/accounts/search_criteria/sales_register/sales_register.py b/erpnext/accounts/search_criteria/sales_register/sales_register.py index 9fdfb00961..c99948e3a7 100644 --- a/erpnext/accounts/search_criteria/sales_register/sales_register.py +++ b/erpnext/accounts/search_criteria/sales_register/sales_register.py @@ -15,6 +15,7 @@ # along with this program. If not, see . # add additional columns +from webnotes.utils import flt, cint, cstr cl = [c[0] for c in sql("""select distinct account_head from `tabSales Taxes and Charges` @@ -61,41 +62,30 @@ for r in res: #convert the result to dictionary for easy retrieval income_acc_dict = {} for ia in income_acc_list: - income_acc_dict[ia[0]] = ia[1] + income_acc_dict[ia[0]] = flt(ia[1]) - income_acc_keys = income_acc_dict.keys() - net_total = 0 for i in income_acc: - val = 0 - #check if income account exists in dict - if i in income_acc_keys: - val = income_acc_dict[i] - val = flt(val and val or 0) + val = income_acc_dict.get(i, 0) net_total += val r.append(val) r.append(net_total) #Get tax for account heads - acc_head_tax = sql("""select account_head, tax_amount + acc_head_tax = sql("""select account_head, sum(tax_amount) from `tabSales Taxes and Charges` where parent = '%s' - and parenttype = 'Sales Invoice'""" %(r[col_idx['ID']],)) + and parenttype = 'Sales Invoice' + group by account_head""" %(r[col_idx['ID']],)) #Convert the result to dictionary for easy retrieval acc_head_tax_dict = {} for a in acc_head_tax: - acc_head_tax_dict[a[0]] = a[1] - - acc_head_keys = acc_head_tax_dict.keys() + acc_head_tax_dict[a[0]] = flt(a[1]) total_tax = 0 for c in cl: - val = 0 - #check if account head exists in dict - if c in acc_head_keys: - val = acc_head_tax_dict[c] - val = flt(val and val or 0) + val = acc_head_tax_dict.get(c, 0) total_tax += val r.append(val) r.append(total_tax)