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/115515
Hello sir,
I have done all the Improvements as suggested.
Thanks,
Digvijay Singh
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-payroll-india-mra-Report-dsi/+merge/115515
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/l10n_in_hr_payroll.py'
--- l10n_in_hr_payroll/l10n_in_hr_payroll.py 2012-07-18 05:16:17 +0000
+++ l10n_in_hr_payroll/l10n_in_hr_payroll.py 2012-07-18 10:35:14 +0000
@@ -278,11 +278,11 @@
_description = 'Bank Advice Lines'
_columns = {
'advice_id': fields.many2one('hr.payroll.advice', 'Bank Advice'),
- 'name': fields.char('Bank Account No.', size=32, required=True),
- 'ifsc_code': fields.char('IFSC Code', size=32),
+ 'name': fields.char('Bank Account No.', size=25, required=True),
+ 'ifsc_code': fields.char('IFSC Code', size=16),
'employee_id': fields.many2one('hr.employee', 'Employee', required=True),
'bysal': fields.float('By Salary', digits_compute=dp.get_precision('Payroll')),
- 'debit_credit': fields.char('C/D', size=8, required=False),
+ 'debit_credit': fields.char('C/D', size=3, required=False),
'company_id': fields.related('advice_id', 'company_id', type='many2one', required=False, relation='res.company', string='Company', store=True),
}
_defaults = {
=== modified file 'l10n_in_hr_payroll/report/report_payroll_advice.rml'
--- l10n_in_hr_payroll/report/report_payroll_advice.rml 2012-07-17 10:30:10 +0000
+++ l10n_in_hr_payroll/report/report_payroll_advice.rml 2012-07-18 10:35:14 +0000
@@ -211,7 +211,7 @@
<para style="terp_default_8_space">
<font color="white"> </font>
</para>
- <blockTable colWidths="70.0,200.0,107.0,81.0,81.0" style="Table4">[[ o.neft == True and removeParentNode('blockTable') ]]
+ <blockTable colWidths="47.0,146.0,158.0,105.0,83.0" style="Table4">[[ o.neft == True and removeParentNode('blockTable') ]]
<tr>
<td>
<para style="P1">SI. No.</para>
@@ -232,7 +232,7 @@
</blockTable>
<section>
<para style="terp_default_8">[[ repeatIn(get_detail(o.line_ids),'line') ]]</para>
- <blockTable colWidths="70.0,200.0,107.0,81.0,81.0" style="Table5">[[ o.neft == True and removeParentNode('blockTable') ]]
+ <blockTable colWidths="47.0,146.0,158.0,105.0,83.0" style="Table5">[[ o.neft == True and removeParentNode('blockTable') ]]
<tr>
<td>
<para style="P11" leftIndent="15" bulletIndent="0">
@@ -255,7 +255,7 @@
</tr>
</blockTable>
</section>
- <blockTable colWidths="40.0,123.0,107.0,107.0,81.0,81.0" style="Table4">[[ o.neft != True and removeParentNode('blockTable') ]]
+ <blockTable colWidths="40.0,129.0,141.0,104.0,77.0,49.0" style="Table4">[[ o.neft != True and removeParentNode('blockTable') ]]
<tr>
<td>
<para style="P1">SI. No.</para>
@@ -279,7 +279,7 @@
</blockTable>
<section>
<para style="terp_default_8">[[ repeatIn(get_detail(o.line_ids),'line') ]]</para>
- <blockTable colWidths="40.0,123.0,107.0,107.0,81.0,81.0" style="Table5">[[ o.neft !=True and removeParentNode('blockTable') ]]
+ <blockTable colWidths="39.0,129.0,140.0,104.0,78.0,49.0" style="Table5">[[ o.neft !=True and removeParentNode('blockTable') ]]
<tr>
<td>
<para style="P11" leftIndent="15" bulletIndent="0">
@@ -305,7 +305,7 @@
</tr>
</blockTable>
</section>
- <blockTable colWidths="50.0,221.0,106.0,82.0,80.0" style="Table6">[[ o.neft == True and removeParentNode('blockTable') ]]
+ <blockTable colWidths="50.0,144.0,158.0,107.0,80.0" style="Table6">[[ o.neft == True and removeParentNode('blockTable') ]]
<tr>
<td>
<para style="terp_tblheader_Details">
@@ -331,7 +331,7 @@
</td>
</tr>
</blockTable>
- <blockTable colWidths="50.0,113.0,214.0,82.0,80.0" style="Table6">[[ o.neft !=True and removeParentNode('blockTable') ]]
+ <blockTable colWidths="50.0,119.0,244.0,99.0,27.0" style="Table6">[[ o.neft !=True and removeParentNode('blockTable') ]]
<tr>
<td>
<para style="terp_tblheader_Details">
_______________________________________________
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
