Merge lp:~openerp-dev/openobject-addons/trunk-qwebreport-l10n_in-employee-salary-bymonth-rsi into lp:~openerp-dev/openobject-addons/trunk-qwebreport-l10n_in

[Rakesh Sindhav(OpenERP)]

Hello Sir,

In the l10n_in_hr_payroll module, i convert the hr_salary_employee_bymonth report from RML report into the QWEB report. There is a better enhancement and improvement in the qweb report.

Thanks & Regard,
rsi

=== modified file 'l10n_in_hr_payroll/__openerp__.py'
--- l10n_in_hr_payroll/__openerp__.py	2013-10-27 12:31:04 +0000
+++ l10n_in_hr_payroll/__openerp__.py	2014-04-23 06:59:38 +0000
@@ -49,6 +49,7 @@
          'security/ir.model.access.csv',
          'l10n_in_hr_payroll_report.xml',
          'l10n_in_hr_payroll_sequence.xml',
+         'views/report_hrsalarybymonth.xml',
          'wizard/hr_salary_employee_bymonth_view.xml',
          'wizard/hr_yearly_salary_detail_view.xml',
          'report/payment_advice_report_view.xml',

=== modified file 'l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml'
--- l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml	2012-08-08 07:04:14 +0000
+++ l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml	2014-04-23 06:59:38 +0000
@@ -18,13 +18,13 @@
             rml="l10n_in_hr_payroll/report/report_payroll_advice.rml"
             string="Print Advice" />
 
-        <report
-            auto="False" 
-            id="hr_salary_employee_bymonth" 
-            model="hr.salary.employee.month" 
-            name="salary.employee.bymonth" 
-            rml="l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml"
-            string="Yearly Salary by Head" /> 
+        <report 
+            id="hr_salary_bymonth"
+            string="Yearly Salary by Head"
+            model="hr.salary.employee.month"
+            report_type="qweb-pdf"
+            file="l10n_in_hr_payroll.report_hrsalarybymonth"
+            name="l10n_in_hr_payroll.report_hrsalarybymonth"/>
 
         <report
             auto="False" 

=== modified file 'l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py'
--- l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py	2012-12-06 14:56:32 +0000
+++ l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py	2014-04-23 06:59:38 +0000
@@ -21,7 +21,7 @@
 
 import datetime
 import time
-
+from openerp.osv import osv
 from openerp.report import report_sxw
 
 class report_hr_salary_employee_bymonth(report_sxw.rml_parse):
@@ -64,8 +64,8 @@
                 current_year = last_year
             current_month = current_month + 1
         for c in range(0, (12-no_months)):
-            mnth_name.append('None')
-            self.mnths.append('None')
+            mnth_name.append('')
+            self.mnths.append('')
         return [mnth_name]
 
     def get_salary(self, form, emp_id, emp_salary, total_mnths):
@@ -81,10 +81,10 @@
         sal = self.cr.fetchall()
         salary = dict(sal)
         total = 0.0
-        cnt = 1
+        cnt = 0
 
         for month in self.mnths:
-            if month <> 'None':
+            if month <> '':
                 if len(month) != 7:
                     month = '0' + str(month)
                 if month in salary and salary[month]:
@@ -102,7 +102,7 @@
     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)
@@ -128,6 +128,10 @@
               self.total += item[count]
         return self.total
 
-report_sxw.report_sxw('report.salary.employee.bymonth', 'hr.salary.employee.month', 'l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml', parser=report_hr_salary_employee_bymonth, header='internal')
+class employee_salary_bymonth(osv.AbstractModel):
+    _name = 'report.l10n_in_hr_payroll.report_hrsalarybymonth'
+    _inherit = 'report.abstract_report'
+    _template = 'l10n_in_hr_payroll.report_hrsalarybymonth'
+    _wrapped_report_class = report_hr_salary_employee_bymonth
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== removed file 'l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml'
--- l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml	2012-10-03 07:14:21 +0000
+++ l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.rml	1970-01-01 00:00:00 +0000
@@ -1,293 +0,0 @@
-<?xml version="1.0"?>
-<document filename="yearly salary report.pdf">
-  <template pageSize="(620.0,842.0)" title="Yearly Salary Report" author="OpenERP" allowSplitting="50">
-    <pageTemplate id="first">
-      <frame id="first" x1="28.0" y1="28.0"  width="539" height="772"/>
-    </pageTemplate>
-  </template>
-  <stylesheet>
-    <blockTableStyle id="Standard_Outline">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table1">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="7,0" stop="7,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="7,-1" stop="7,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="8,0" stop="8,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="8,-1" stop="8,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="9,0" stop="9,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="9,-1" stop="9,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="10,0" stop="10,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="10,-1" stop="10,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="11,0" stop="11,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="11,-1" stop="11,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="12,0" stop="12,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="12,-1" stop="12,-1"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="13,0" stop="13,0"/>
-      <lineStyle kind="LINEBELOW" colorName="#000000" start="13,-1" stop="13,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table2">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="0,-1" stop="0,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="1,-1" stop="1,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="2,-1" stop="2,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="3,-1" stop="3,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="4,-1" stop="4,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="5,-1" stop="5,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="6,-1" stop="6,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="7,-1" stop="7,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="8,-1" stop="8,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="9,-1" stop="9,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="10,-1" stop="10,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="11,-1" stop="11,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="12,-1" stop="12,-1"/>
-      <lineStyle kind="LINEBELOW" colorName="#cccccc" start="13,-1" stop="13,-1"/>
-    </blockTableStyle>
-    <blockTableStyle id="Table6">
-      <blockAlignment value="LEFT"/>
-      <blockValign value="TOP"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="0,0" stop="0,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="1,0" stop="1,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="2,0" stop="2,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="3,0" stop="3,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="4,0" stop="4,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="5,0" stop="5,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="6,0" stop="6,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="7,0" stop="7,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="8,0" stop="8,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="9,0" stop="9,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="10,0" stop="10,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="11,0" stop="11,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="12,0" stop="12,0"/>
-      <lineStyle kind="LINEABOVE" colorName="#000000" start="13,0" stop="13,0"/>
-    </blockTableStyle>
-    <initialize>
-      <paraStyle name="all" alignment="justify"/>
-    </initialize>
-    <paraStyle name="P1" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P2" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P3" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P4" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P5" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="P6" fontName="Helvetica" fontSize="9.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Standard" fontName="Helvetica"/>
-    <paraStyle name="Heading" fontName="Helvetica" fontSize="14.0" leading="17" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="Text body" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="List" fontName="Helvetica" spaceBefore="0.0" spaceAfter="6.0"/>
-    <paraStyle name="Caption" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="Index" fontName="Helvetica"/>
-    <paraStyle name="terp_header" fontName="Helvetica-Bold" fontSize="15.0" leading="19" alignment="LEFT" spaceBefore="12.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_default_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_8" fontName="Helvetica" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_header_Centre" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_Details" fontName="Helvetica-Bold" fontSize="7.0" leading="11" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_Details_Right" fontName="Helvetica-Bold" fontSize="7.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="Table Contents" fontName="Helvetica"/>
-    <paraStyle name="Table Heading" fontName="Helvetica" alignment="CENTER"/>
-    <paraStyle name="terp_default_9" fontName="Helvetica" fontSize="5.0" leading="5" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_8" fontName="Helvetica" fontSize="5.0" leading="2" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="7.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="5.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <paraStyle name="terp_tblheader_General" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General_Centre" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="6.0" spaceAfter="6.0"/>
-    <paraStyle name="terp_tblheader_General_Right" fontName="Helvetica-Bold" fontSize="5.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
-    <images/>
-  </stylesheet>
-  <story>
-    <para style="P1">Yearly Salary Details </para>
-    <para style="P5">From <u>[[ formatLang(data['form']['start_date'], date=True) ]]</u> To <u>[[ formatLang(data['form']['end_date'], date=True) ]]</u> of <u>[[ (data['form']['category_id'][1]) ]]</u> Category</para>
-    <para style="P6">
-      <font color="white"> </font>
-    </para>
-    <section>
-      <para style="terp_default_1">[[ repeatIn(get_periods(data['form']),'m') ]]</para>
-      <blockTable colWidths="55.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,57.0" style="Table1">
-        <tr>
-          <td>
-            <para style="terp_tblheader_Details">Name</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_Details_Right">[[ m[0] != 'None' and m[0] or '' ]]</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_Details_Right">[[ m[1] != 'None' and m[1] or '' ]]</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_Details_Right">[[ m[2] != 'None' and m[2] or '' ]]</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_Details_Right">[[ m[3] != 'None' and m[3] or '' ]]</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_Details_Right">[[ m[4] != 'None' and m[4] or '' ]]</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_Details_Right">[[ m[5] != 'None' and m[5] or '' ]]</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_Details_Right">[[ m[6] != 'None' and m[6] or '' ]]</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_Details_Right">[[ m[7] != 'None' and m[7] or '' ]]</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_Details_Right">[[ m[8] != 'None' and m[8] or '' ]]</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_Details_Right">[[ m[9] != 'None' and m[9] or '' ]]</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_Details_Right">[[ m[10] != 'None' and m[10] or '' ]]</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_Details_Right">[[ m[11] != 'None' and m[11] or '' ]]</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_Details_Right">Total</para>
-          </td>
-        </tr>
-      </blockTable>
-      <section>
-        <para style="terp_default_1">[[ repeatIn(get_employee(data['form']),'e') ]]</para>
-        <blockTable colWidths="55.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,57.0" style="Table2">
-          <tr>
-            <td>
-              <para style="terp_default_9">[[ e[0] ]]</para>
-            </td>
-            <td>
-              <para style="terp_default_Right_8">
-                <font face="Helvetica" size="5.0">[[ (e[1]!='' and formatLang(e[1])) or removeParentNode('font') ]]</font>
-              </para>
-            </td>
-            <td>
-              <para style="terp_default_Right_8">
-                <font face="Helvetica" size="5.0">[[ (e[2]!='' and formatLang(e[2])) or removeParentNode('font') ]]</font>
-              </para>
-            </td>
-            <td>
-              <para style="terp_default_Right_8">
-                <font face="Helvetica" size="5.0">[[ (e[3]!='' and formatLang(e[3])) or removeParentNode('font') ]]</font>
-              </para>
-            </td>
-            <td>
-              <para style="terp_default_Right_8">
-                <font face="Helvetica" size="5.0">[[ (e[4]!='' and formatLang(e[4])) or removeParentNode('font') ]]</font>
-              </para>
-            </td>
-            <td>
-              <para style="terp_default_Right_8">
-                <font face="Helvetica" size="5.0">[[ (e[5]!='' and formatLang(e[5])) or removeParentNode('font') ]]</font>
-              </para>
-            </td>
-            <td>
-              <para style="terp_default_Right_8">
-                <font face="Helvetica" size="5.0">[[ (e[6]!='' and formatLang(e[6])) or removeParentNode('font') ]]</font>
-              </para>
-            </td>
-            <td>
-              <para style="terp_default_Right_8">
-                <font face="Helvetica" size="5.0">[[ (e[7]!='' and formatLang(e[7])) or removeParentNode('font') ]]</font>
-              </para>
-            </td>
-            <td>
-              <para style="terp_default_Right_8">
-                <font face="Helvetica" size="5.0">[[ (e[8]!='' and formatLang(e[8])) or removeParentNode('font') ]]</font>
-              </para>
-            </td>
-            <td>
-              <para style="terp_default_Right_8">
-                <font face="Helvetica" size="5.0">[[ (e[9]!='' and formatLang(e[9])) or removeParentNode('font') ]]</font>
-              </para>
-            </td>
-            <td>
-              <para style="terp_default_Right_8">
-                <font face="Helvetica" size="5.0">[[ (e[10]!='' and formatLang(e[10])) or removeParentNode('font') ]]</font>
-              </para>
-            </td>
-            <td>
-              <para style="terp_default_Right_8">
-                <font face="Helvetica" size="5.0">[[ (e[11]!='' and formatLang(e[11])) or removeParentNode('font') ]]</font>
-              </para>
-            </td>
-            <td>
-              <para style="terp_default_Right_8">
-                <font face="Helvetica" size="5.0">[[ (e[12]!='' and formatLang(e[12])) or removeParentNode('font') ]]</font>
-              </para>
-            </td>
-            <td>
-              <para style="terp_default_Right_9_Bold">[[ formatLang(e[13],currency_obj= company.currency_id)]] </para>
-            </td>
-          </tr>
-        </blockTable>
-      </section>
-    </section>
-    <section>
-      <para style="terp_default_1">[[ repeatIn(get_months_tol(),'t') ]]</para>
-      <blockTable colWidths="55.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,40.0,57.0" style="Table6">
-        <tr>
-          <td>
-            <para style="terp_tblheader_Details">Total</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[1],currency_obj= company.currency_id) or removeParentNode('para') ]] </para>
-          </td>
-          <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[2],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
-          </td>
-          <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[3],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
-          </td>
-          <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[4],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
-          </td>
-          <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[5],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
-          </td>
-          <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[6],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
-          </td>
-          <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[7],currency_obj= company.currency_id) or removeParentNode('para')]] ]</para>
-          </td>
-          <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[8],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
-          </td>
-          <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[9],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
-          </td>
-          <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[10],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
-          </td>
-          <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[11],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
-          </td>
-          <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(t[12],currency_obj= company.currency_id) or removeParentNode('para')]] </para>
-          </td>
-          <td>
-            <para style="terp_tblheader_General_Right">[[ formatLang(get_total(), currency_obj = company.currency_id)]]</para>
-          </td>
-        </tr>
-      </blockTable>
-    </section>
-  </story>
-</document>

=== removed file 'l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.sxw'
Binary files l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.sxw	2012-10-03 07:14:21 +0000 and l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.sxw	1970-01-01 00:00:00 +0000 differ
=== added directory 'l10n_in_hr_payroll/views'
=== added file 'l10n_in_hr_payroll/views/report_hrsalarybymonth.xml'
--- l10n_in_hr_payroll/views/report_hrsalarybymonth.xml	1970-01-01 00:00:00 +0000
+++ l10n_in_hr_payroll/views/report_hrsalarybymonth.xml	2014-04-23 06:59:38 +0000
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+<data>
+    <template id="report_hrsalarybymonth">
+        <t t-call="report.html_container">
+        <t t-call="report.internal_layout">
+            <div class="page">
+                <div class="text-center">
+                    <h4 class="text-center"><strong>Yearly Salary Details</strong></h4>
+                    <h5>From <u><span t-esc="formatLang(data['form']['start_date'], date=True)"/></u> To <u><span t-esc="formatLang(data['form']['end_date'], date=True)"/></u> of <u><span t-esc="data['form']['category_id'][1]"/></u> Category</h5>
+                </div>
+                <table class="table table-condensed">
+                    <thead>
+                        <tr style="border-top: 1px solid black">
+                            <th>Name</th>
+                            <t t-foreach="get_periods(data['form'])" t-as="m">
+                                <t t-foreach="m" t-as="month">
+                                    <th class="text-right" t-esc="month" />
+                                </t>
+                            </t>
+                            <th class="text-right">Total</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <t t-foreach="get_employee(data['form'])" t-as="e">
+                            <tr>
+                                <td t-esc="e[0]" />
+                                <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>
+                    </tbody>
+                    <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">
+                                    <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>
+                        </tr>
+                    </tfoot>
+                </table>
+            </div>
+        </t>
+        </t>
+    </template>
+</data>
+</openerp>
\ No newline at end of file

=== modified file 'l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py'
--- l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py	2013-10-27 12:31:04 +0000
+++ l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py	2014-04-23 06:59:38 +0000
@@ -20,7 +20,6 @@
 ##############################################################################
 
 import time
-
 from openerp.osv import fields, osv
 
 class hr_salary_employee_bymonth(osv.osv_memory):
@@ -60,11 +59,8 @@
         res = self.read(cr, uid, ids, context=context)
         res = res and res[0] or {}
         datas.update({'form': res})
-        return {
-            'type': 'ir.actions.report.xml',
-            'report_name': 'salary.employee.bymonth',
-            'datas': datas,
-       }
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+        return self.pool['report'].get_action(cr, uid, ids, 
+                        'l10n_in_hr_payroll.report_hrsalarybymonth', 
+                        data=datas, context=context)
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: