From 3ddfbce96e2e1ad0d865ba3a51da4cbcfe5e614e Mon Sep 17 00:00:00 2001 From: Digvijay Singh Date: Wed, 18 Jul 2012 15:56:38 +0530 Subject: [PATCH] [IMP]l10n_in_hr_payroll: Set Total Below Bank Account number with Total Amount in rml Report bzr revid: dsi@tinyerp.com-20120718102638-1a1jkjvh5tbtw7ot --- addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py | 6 +++--- .../report/report_payroll_advice.rml | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py index 57d7a492a97..9edfa0031ef 100644 --- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py +++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll.py @@ -268,11 +268,11 @@ class payroll_advice_line(osv.osv): _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 = { diff --git a/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml b/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml index 7c88431485b..76b5e00fe63 100644 --- a/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml +++ b/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml @@ -211,7 +211,7 @@ - [[ o.neft == True and removeParentNode('blockTable') ]] + [[ o.neft == True and removeParentNode('blockTable') ]] SI. No. @@ -232,7 +232,7 @@
[[ repeatIn(get_detail(o.line_ids),'line') ]] - [[ o.neft == True and removeParentNode('blockTable') ]] + [[ o.neft == True and removeParentNode('blockTable') ]] @@ -255,7 +255,7 @@
- [[ o.neft != True and removeParentNode('blockTable') ]] + [[ o.neft != True and removeParentNode('blockTable') ]] SI. No. @@ -279,7 +279,7 @@
[[ repeatIn(get_detail(o.line_ids),'line') ]] - [[ o.neft !=True and removeParentNode('blockTable') ]] + [[ o.neft !=True and removeParentNode('blockTable') ]] @@ -305,7 +305,7 @@
- [[ o.neft == True and removeParentNode('blockTable') ]] + [[ o.neft == True and removeParentNode('blockTable') ]] @@ -331,7 +331,7 @@ - [[ o.neft !=True and removeParentNode('blockTable') ]] + [[ o.neft !=True and removeParentNode('blockTable') ]]