odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP]: Rename report name report_hryearly salary 

bzr revid: atp@tinyerp.com-20140425175230-sctyfvvn87c6exm9
This commit is contained in:
Atul Patel (OpenERP) 2014-04-25 23:22:30 +05:30
parent 105331f12a
commit ae858f4d68
5 changed files with 42 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/l10n_in_hr_payroll/__openerp__.py
View File

@ -55,7 +55,7 @@ Indian Payroll Salary Rules.
'wizard/hr_yearly_salary_detail_view.xml',
'report/payment_advice_report_view.xml',
'report/payslip_report_view.xml',
'views/report_hr_yearly_salary_detail.xml',
'views/report_hryearlysalary.xml',
'views/report_payrolladvice.xml',
],
'test': [

4
addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml
View File

@ -31,8 +31,8 @@
auto="False"
id="yearly_salary"
model="yearly.salary.detail"
name="l10n_in_hr_payroll.report_hr_yearly_salary"
file="l10n_in_hr_payroll.report_hr_yearly_salary"
name="l10n_in_hr_payroll.report_hryearlysalary"
file="l10n_in_hr_payroll.report_hryearlysalary"
report_type="qweb-pdf"
string="Yearly Salary by Employee" />

4
addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py
View File

@ -161,9 +161,9 @@ class employees_yearly_salary_report(report_sxw.rml_parse):
return self.total
class wrapped_report_payslip(osv.AbstractModel):
_name = 'report.l10n_in_hr_payroll.report_hr_yearly_salary'
_name = 'report.l10n_in_hr_payroll.report_hryearlysalary'
_inherit = 'report.abstract_report'
_template = 'l10n_in_hr_payroll.report_hr_yearly_salary'
_template = 'l10n_in_hr_payroll.report_hryearlysalary'
_wrapped_report_class = employees_yearly_salary_report
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

73
addons/l10n_in_hr_payroll/views/report_hr_yearly_salary_detail.xml → addons/l10n_in_hr_payroll/views/report_hryearlysalary.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<template id="report_hr_yearly_salary">
<template id="report_hryearlysalary">
<t t-call="report.html_container">
<t t-foreach="get_employee(data['form'])" t-as="employee">
<t t-call="report.internal_layout">
@ -74,48 +74,47 @@
</table>
<table class="table table-condensed">
<thead>
<tr>
<tr t-foreach="get_periods(data['form'])" t-as="months">
<span t-esc="get_employee_detail(data['form'], employee)"/>
<th>Title</th>
<t t-foreach="get_periods(data['form'])[0]" t-as="months">
<span t-esc="get_employee_detail(data['form'], employee)"/>
<th>
<t t-if="months">
<span t-esc="months"/>
</t>
</th>
</t>
<t t-foreach="months[0:12]" t-as="month_sal">
<th class="text-right">
<span t-esc="month_sal"/>
</th>
</t>
<th>Total</th>
</tr>
</thead>
<tbody>
<td><strong> Allowances with Basic:</strong></td>
<t t-foreach="get_allow()" t-as="allowanc">
<tr>
<t t-if="allowanc[0] =='Basic' or allowanc[0] == 'Gross'">
<th><span t-esc="allowanc[0]"/></th>
</t>
<t t-if="allowanc[0] !='Basic' and allowanc[0] != 'Gross'">
<td><span t-esc="allowanc[0]"/></td>
</t>
<t t-foreach="allowanc[1:(len(allowanc)-1)]" t-as="allow">
<td><span t-esc="allow"/></td>
</t>
</tr>
</t>
<t t-foreach="get_deduct()" t-as="deduct">
<tr>
<t t-if="deduct[0] == 'Net'">
<th><span t-esc="deduct[0]"/></th>
</t>
<t t-if="deduct[0] != 'Net'">
<td><span t-esc="deduct[0]"/></td>
</t>
<t t-foreach="deduct[1:(len(deduct)-1)]" t-as="d">
<td><span t-esc="d"/></td>
</t>
</tr>
</t>
<tr t-foreach="get_allow()" t-as="allowance">
<t t-if="allowance[0] in ['Basic','Gross']">
<td><strong><span t-esc="allowance[0]"/></strong></td>
<t t-foreach="allowance[1:13]" t-as="allow">
<td><span t-esc="allow"/></td>
</t>
</t>
<t t-if="allowance[0] not in ['Basic','Gross']">
<td><span t-esc="allowance[0]"/></td>
<t t-foreach="allowance[1:13]" t-as="allow">
<td><span t-esc="formatLang(allow)"/></td>
</t>
</t>
<td t-esc="formatLang(allowance[13],currency_obj= company.currency_id)"/>
</tr>
<td><strong> Deductions:</strong></td>
<tr t-foreach="get_deduct()" t-as="deduct">
<t t-if="deduct[0] in ['Net']">
<td><strong><span t-esc="deduct[0]"/></strong></td>
</t>
<t t-if="deduct[0] not in ['Net']">
<td><span t-esc="deduct[0]"/></td>
</t>
<t t-foreach="deduct[1:12]" t-as="d">
<td><span t-esc="formatLang(d)"/></td>
</t>
<td t-esc="formatLang(deduct[13],currency_obj= company.currency_id)"/>
</tr>
</tbody>
</table>
</div>

2
addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail.py
View File

@ -55,6 +55,6 @@ class yearly_salary_detail(osv.osv_memory):
res = self.read(cr, uid, ids, context=context)
res = res and res[0] or {}
datas.update({'form':res})
return self.pool['report'].get_action(cr, uid, ids, 'l10n_in_hr_payroll.report_hr_yearly_salary', data=datas, context=context)
return self.pool['report'].get_action(cr, uid, ids, 'l10n_in_hr_payroll.report_hryearlysalary', data=datas, context=context)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: