Merge lp:~openerp-dev/openobject-addons/trunk-bug-1225862-avo into lp:openobject-addons

Proposed by Amit Vora(OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-addons/trunk-bug-1225862-avo
Merge into: lp:openobject-addons
Diff against target: 12 lines (+1/-1)
1 file modified
hr_payroll/report/report_payslip.rml (+1/-1)
To merge this branch: bzr merge lp:~openerp-dev/openobject-addons/trunk-bug-1225862-avo
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+187504@code.launchpad.net

Description of the change

Hello,
        I have change the field because of Payslip report uses otherid in place of bank account.

Thanks,
Amit.

To post a comment you must log in.

Unmerged revisions

8902. By Amit Vora(OpenERP)

[FIX] improve code

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'hr_payroll/report/report_payslip.rml'
--- hr_payroll/report/report_payslip.rml 2012-11-29 22:26:45 +0000
+++ hr_payroll/report/report_payslip.rml 2013-09-25 12:50:43 +0000
@@ -232,7 +232,7 @@
232 <para style="P15">Bank Account</para>232 <para style="P15">Bank Account</para>
233 </td>233 </td>
234 <td>234 <td>
235 <para style="P4">[[ o.employee_id.otherid or '' ]]</para>235 <para style="P4">[[ o.employee_id.bank_account_id.acc_number or '' ]]</para>
236 </td>236 </td>
237 </tr>237 </tr>
238 </blockTable>238 </blockTable>

Subscribers

People subscribed via source and target branches

to all changes: