hr reports cleanup
diff --git a/erpnext/hr/search_criteria/monthly_salary_register/monthly_salary_register.py b/erpnext/hr/search_criteria/monthly_salary_register/monthly_salary_register.py
index 998b927..bbf6fb0 100644
--- a/erpnext/hr/search_criteria/monthly_salary_register/monthly_salary_register.py
+++ b/erpnext/hr/search_criteria/monthly_salary_register/monthly_salary_register.py
@@ -43,8 +43,8 @@
for d1 in li:
d2 = '%s'%d1
- earn_ret=convert_to_lists(sql("select e_type,e_amount from `tabSS Earning Detail` where parent = '%s'"%r[col_idx['ID']]))
- ded_ret=convert_to_lists(sql("select d_type,d_amount from `tabSS Deduction Detail` where parent = '%s'"%r[col_idx['ID']]))
+ earn_ret=convert_to_lists(sql("select e_type,e_amount from `tabSalary Slip Earning` where parent = '%s'"%r[col_idx['ID']]))
+ ded_ret=convert_to_lists(sql("select d_type,d_amount from `tabSalary Slip Deduction` where parent = '%s'"%r[col_idx['ID']]))
for e in earn_ret:
@@ -78,7 +78,7 @@
for r in res:
lst0 = '%s'%lst[0]
- total_ear += r[col_idx[lst0]]
+ total_ear += flt(r[col_idx[lst0]])
total.append(total_ear)
@@ -87,7 +87,7 @@
total_ded = 0
for r in res:
lst0 = '%s'%lst[0]
- total_ded += r[col_idx[lst0]]
+ total_ded += flt(r[col_idx[lst0]])
total.append(total_ded)
diff --git a/erpnext/patches/jan_mar_2012/rename_dt.py b/erpnext/patches/jan_mar_2012/rename_dt.py
index 295d4e5..693fd77 100644
--- a/erpnext/patches/jan_mar_2012/rename_dt.py
+++ b/erpnext/patches/jan_mar_2012/rename_dt.py
@@ -129,7 +129,7 @@
'periodic_sales_summary', 'monthly_despatched_trend', 'sales', 'sales_order',
'sales_order1', 'sales_agentwise_commission', 'test_report',
'territory_wise_sales_-_target_vs_actual_',
- 'pending_po_items_to_bill1', 'pending_po_items_to_receive1')""")
+ 'pending_po_items_to_bill1', 'pending_po_items_to_receive1', 'expense_vouchers', 'pending_expense_vouchers')""")
webnotes.conn.sql("""
DELETE FROM `tabSearch Criteria`