From be542630e88d834cc20401cafda990f2a47a9ba7 Mon Sep 17 00:00:00 2001
From: "Rakesh Sindhav (OpenERP)" <rsi@tinyerp.com>
Date: Wed, 23 Apr 2014 12:27:55 +0530
Subject: [PATCH] [IMP]: Code optimization in the view file

bzr revid: rsi@tinyerp.com-20140423065755-83tyantoitle2ow4
---
 .../report_hr_salary_employee_bymonth.py      |  4 +-
 .../views/report_hrsalarybymonth.xml          | 38 ++++---------------
 2 files changed, 10 insertions(+), 32 deletions(-)

diff --git a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
index 6d29bd82efc..8873f6e2465 100644
--- a/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
+++ b/addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
@@ -81,7 +81,7 @@ class report_hr_salary_employee_bymonth(report_sxw.rml_parse):
         sal = self.cr.fetchall()
         salary = dict(sal)
         total = 0.0
-        cnt = 1
+        cnt = 0
 
         for month in self.mnths:
             if month <> '':
@@ -102,7 +102,7 @@ class report_hr_salary_employee_bymonth(report_sxw.rml_parse):
     def get_employee(self, form):
         emp_salary = []
         salary_list = []
-        total_mnths=['Total', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
+        total_mnths=[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
         emp_obj = self.pool.get('hr.employee')
         emp_ids = form.get('employee_ids', [])
         employees  = emp_obj.browse(self.cr, self.uid, emp_ids, context=self.context)
diff --git a/addons/l10n_in_hr_payroll/views/report_hrsalarybymonth.xml b/addons/l10n_in_hr_payroll/views/report_hrsalarybymonth.xml
index a2e3de1ef32..18a81412e26 100644
--- a/addons/l10n_in_hr_payroll/views/report_hrsalarybymonth.xml
+++ b/addons/l10n_in_hr_payroll/views/report_hrsalarybymonth.xml
@@ -14,18 +14,9 @@
                         <tr style="border-top: 1px solid black">
                             <th>Name</th>
                             <t t-foreach="get_periods(data['form'])" t-as="m">
-                                    <th class="text-right" t-esc="m[0]" />
-                                    <th class="text-right" t-esc="m[1]" /> 
-                                    <th class="text-right" t-esc="m[2]" />
-                                    <th class="text-right" t-esc="m[3]" />
-                                    <th class="text-right" t-esc="m[4]" />
-                                    <th class="text-right" t-esc="m[5]" />
-                                    <th class="text-right" t-esc="m[6]" />
-                                    <th class="text-right" t-esc="m[7]" />
-                                    <th class="text-right" t-esc="m[8]" />
-                                    <th class="text-right" t-esc="m[9]" />
-                                    <th class="text-right" t-esc="m[10]" />
-                                    <th class="text-right" t-esc="m[11]" />
+                                <t t-foreach="m" t-as="month">
+                                    <th class="text-right" t-esc="month" />
+                                </t>
                             </t>
                             <th class="text-right">Total</th>
                         </tr>
@@ -34,18 +25,9 @@
                         <t t-foreach="get_employee(data['form'])" t-as="e">
                             <tr>
                                 <td t-esc="e[0]" />
-                                <td class="text-right" t-esc="e[1]" />
-                                <td class="text-right" t-esc="e[2]" />
-                                <td class="text-right" t-esc="e[3]" />
-                                <td class="text-right" t-esc="e[4]" />
-                                <td class="text-right" t-esc="e[5]" />
-                                <td class="text-right" t-esc="e[6]" />
-                                <td class="text-right" t-esc="e[7]" />
-                                <td class="text-right" t-esc="e[8]" />
-                                <td class="text-right" t-esc="e[9]" />
-                                <td class="text-right" t-esc="e[10]" />
-                                <td class="text-right" t-esc="e[11]" />
-                                <td class="text-right" t-esc="e[12]" />
+                                <t t-foreach="e[1:13]" t-as="month_sal">
+                                    <td class="text-right" t-esc="month_sal" />
+                                </t>
                                 <td class="text-right" t-esc="formatLang(e[13],currency_obj= company.currency_id)" />
                             </tr>
                         </t>
@@ -53,13 +35,9 @@
                     <tfoot>
                         <tr class="border-black">
                             <t t-foreach="get_months_tol()" t-as="t">
+                                <td><strong><span>Total</span></strong></td>
                                 <t t-foreach="t" t-as="tdata">
-                                    <t t-if="tdata=='Total'">
-                                        <td><strong><span>Total</span></strong></td>
-                                    </t>
-                                    <t t-if="tdata!='Total'">
-                                        <td class="text-right"><strong><span t-esc="formatLang(tdata, currency_obj=company.currency_id)"/></strong></td>
-                                    </t>
+                                    <td class="text-right"><strong><span t-esc="formatLang(tdata, currency_obj=company.currency_id)"/></strong></td>
                                 </t>
                                 <td class="text-right"><strong><span t-esc="formatLang(get_total(), currency_obj=company.currency_id)" /></strong></td>
                             </t>