diff --git a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml index 636095dae12..b6392871434 100644 --- a/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml +++ b/addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml @@ -15,7 +15,7 @@ id="payroll_advice" model="hr.payroll.advice" name="payroll.advice" - rml="l10n_in_hr_payroll/report/payment_advice.rml" + rml="l10n_in_hr_payroll/report/report_payroll_advice.rml" string="Print Advice" /> diff --git a/addons/l10n_in_hr_payroll/report/report_payroll_advice.py b/addons/l10n_in_hr_payroll/report/report_payroll_advice.py index 61ad9a8efc5..7438965f465 100644 --- a/addons/l10n_in_hr_payroll/report/report_payroll_advice.py +++ b/addons/l10n_in_hr_payroll/report/report_payroll_advice.py @@ -31,7 +31,6 @@ class payroll_advice_report(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): super(payroll_advice_report, self).__init__(cr, uid, name, context) - self.total_bysal = 0.00 self.localcontext.update({ 'time': time, 'get_month': self.get_month, @@ -61,17 +60,18 @@ class payroll_advice_report(report_sxw.rml_parse): def get_detail(self, line_ids): result =[] - res = {} + self.total_bysal = 0.00 for l in line_ids: + res = {} res.update({ 'name': l.employee_id.name, 'acc_no': l.name, 'bysal': l.bysal, }) self.total_bysal += l.bysal - result.append(res) + result.append(res) return result -report_sxw.report_sxw('report.payroll.advice', 'hr.payroll.advice', 'l10n_in_hr_payroll/report/payment_advice.rml', parser=payroll_advice_report) +report_sxw.report_sxw('report.payroll.advice', 'hr.payroll.advice', 'l10n_in_hr_payroll/report/report_payroll_advice.rml', parser=payroll_advice_report) # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_in_hr_payroll/report/payment_advice.rml b/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml similarity index 90% rename from addons/l10n_in_hr_payroll/report/payment_advice.rml rename to addons/l10n_in_hr_payroll/report/report_payroll_advice.rml index 176543fdcdd..55014e3b1ee 100644 --- a/addons/l10n_in_hr_payroll/report/payment_advice.rml +++ b/addons/l10n_in_hr_payroll/report/report_payroll_advice.rml @@ -66,15 +66,15 @@ - - - + + + - - - - + + + + @@ -137,15 +137,13 @@ - - Payment advice - + Payment Advice - [[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]] + [[ formatLang(time.strftime('%Y-%m-%d'),date=True) ]] @@ -185,7 +183,7 @@ - Payment Advice from [[ o.name ]] A/C no. [[ o.company_id.bank_ids and o.company_id.bank_ids[0].acc_number ]] form period [[ get_month(o.date)['from_name'] ]] to [[ get_month(o.date)['to_name'] ]] + Payment Advice from [[ o.name ]] A/C no. [[ o.company_id.bank_ids and o.company_id.bank_ids[0].acc_number ]] form period [[ get_month(o.date)['from_name'] ]] to [[ get_month(o.date)['to_name'] ]] @@ -199,7 +197,7 @@ - + SI. No. @@ -208,36 +206,36 @@ Name of the Employe - Bank Account No. + Bank Account No. - By Salary + By Salary
[[ repeatIn(get_detail(o.line_ids),'line') ]] - + - - . + + - [[ line['name'] ]] + [[ line['name'] ]] - [[ line['acc_no'] ]] + [[ line['acc_no'] ]] - [[formatLang(line['bysal'])]] [[ (company.currency_id and company.currency_id.symbol) or '' ]] + [[formatLang(line['bysal'])]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]
- + @@ -245,16 +243,16 @@ - + Total : [[ o.line_ids==[] and removeParentNode('para') ]] - + - [[ o.line_ids==[] and removeParentNode('para') ]][[ formatLang(get_bysal_total()) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]] + [[ o.line_ids==[] and removeParentNode('para') ]][[ formatLang(get_bysal_total()) ]] [[ (company.currency_id and company.currency_id.symbol) or '' ]]