Khushboo Bhatt(openerp) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-payroll-india-mra-report-header-kbh
into lp:~openerp-dev/openobject-addons/trunk-payroll-india-mra.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-india-mra-report-header-kbh/+merge/118689
Hello,
l10n_in_hr_payroll::
I have improved employees details in yearly salary by employee report.
Thank you,
KBH.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-india-mra-report-header-kbh/+merge/118689
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-payroll-india-mra-report-header-kbh
into lp:~openerp-dev/openobject-addons/trunk-payroll-india-mra.
=== modified file 'l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml'
--- l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml 2012-08-03 09:17:29 +0000
+++ l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml 2012-08-08 08:53:19 +0000
@@ -276,19 +276,19 @@
<para style="terp_tblheader_Details">Employee Code</para>
</td>
<td>
- <para style="terp_default_9">[[ o.ssnid ]]</para>
+ <para style="terp_default_9">[[ o.identification_id ]]</para>
</td>
<td>
<para style="terp_tblheader_Details">Department</para>
</td>
<td>
- <para style="terp_default_9">[[ o.company_id and o.company_id.name or '' ]]</para>
+ <para style="terp_default_9">[[ o.department_id and o.department_id.name or '' ]]</para>
</td>
<td>
<para style="terp_tblheader_Details">Bank</para>
</td>
<td>
- <para style="terp_default_9">[[ o.otherid or '' ]]</para>
+ <para style="terp_default_9">[[ o.bank_account_id and o.bank_account_id.bank.name or '' ]]</para>
</td>
</tr>
</blockTable>
@@ -320,7 +320,7 @@
<para style="terp_tblheader_Details">Designation</para>
</td>
<td>
- <para style="terp_default_9">[[ o.contract_ids and o.contract_ids[0].job_id.name or '' ]]</para>
+ <para style="terp_default_9">[[ o.job_id and o.job_id.name or '' ]]</para>
</td>
<td>
<para style="terp_tblheader_Details">Phone No.</para>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
