digvijay singh has proposed merging
lp:~openerp-dev/openobject-addons/trunk-payroll-india-mra-Report-dsi 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-dsi/+merge/115309
Hello,
I have set the "Total" Under bank account number and Amount Under salary
in rml report.
Thanks,
Digvijay Singh
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-india-mra-Report-dsi/+merge/115309
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-payroll-india-mra-Report-dsi into
lp:~openerp-dev/openobject-addons/trunk-payroll-india-mra.
=== modified file 'l10n_in_hr_payroll/report/report_payroll_advice.rml'
--- l10n_in_hr_payroll/report/report_payroll_advice.rml 2012-07-16 13:04:32 +0000
+++ l10n_in_hr_payroll/report/report_payroll_advice.rml 2012-07-17 10:40:04 +0000
@@ -305,7 +305,33 @@
</tr>
</blockTable>
</section>
- <blockTable colWidths="58.0,251.0,67.0,94.0,70.0" style="Table6">
+ <blockTable colWidths="50.0,221.0,106.0,82.0,80.0" style="Table6">[[ o.neft == True and removeParentNode('blockTable') ]]
+ <tr>
+ <td>
+ <para style="terp_tblheader_Details">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="P2">
+ <font color="white"> </font>
+ </para>
+ </td>
+ <td>
+ <para style="P1">Total : <font face="Helvetica" size="6.0">[[ o.line_ids==[] and removeParentNode('para') ]]</font></para>
+ <para style="P4"/>
+ </td>
+ <td>
+ <para style="P4"><font face="Helvetica" size="6.0">[[ o.line_ids==[] and removeParentNode('para') ]]</font>[[ formatLang(get_bysal_total()) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]</para>
+ </td>
+ <td>
+ <para style="P4">
+ <font color="white"> </font>
+ </para>
+ </td>
+ </tr>
+ </blockTable>
+ <blockTable colWidths="50.0,113.0,214.0,82.0,80.0" style="Table6">[[ o.neft !=True and removeParentNode('blockTable') ]]
<tr>
<td>
<para style="terp_tblheader_Details">
=== modified file 'l10n_in_hr_payroll/report/report_payroll_advice.sxw'
Binary files l10n_in_hr_payroll/report/report_payroll_advice.sxw 2012-07-13 06:38:31 +0000 and l10n_in_hr_payroll/report/report_payroll_advice.sxw 2012-07-17 10:40:04 +0000 differ
_______________________________________________
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
