pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX]: ADD formatLang function in date field. use h2 tag in report title.

Browse Source 
bzr revid: atp@tinyerp.com-20140425041641-vk95pdxb8w3034ij
This commit is contained in:
Atul Patel (OpenERP)
2014-04-25 09:46:41 +05:30
parent 0b2467833a
commit e2aa0707bb
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/l10n_in_hr_payroll/views/report_hr_yearly_salary_detail.xml
+3 -5
View File
@@ -8,8 +8,8 @@
<t t-foreach="get_employee(data['form'])" t-as="employee">
<h2><span t-field="employee.company_id"/></h2>
<p> From
<u><span t-esc="data['form']['date_from']"/></u>
To <u><span t-esc="data['form']['date_to']"/></u> </p>
<u><span t-esc="formatLang(data['form']['date_from'], date=True)"/></u>
To <u><span t-esc="formatLang(data['form']['date_to'], date=True)"/></u> </p>
<table class="table table-condensed table-bordered">
<tr>
<td><strong>Employee Code</strong></td>
@@ -102,8 +102,7 @@
</tr>
<tr>
<td><strong>Deductions:</strong></td>
<t t-foreach="get_deduct()" t-as="deduct">
<tr>
<tr t-foreach="get_deduct()" t-as="deduct">
<t t-if="deduct[0] == 'Net'">
<strong><span t-esc="deduct[0]"/></strong>
</t>
@@ -111,7 +110,6 @@
<span t-esc="deduct[0]"/>
</t>
</tr>
</t>
</tr>
</table>
</t>
addons/l10n_in_hr_payroll/views/report_hrsalarybymonth.xml
+2 -2
View File
@@ -6,8 +6,8 @@
<t t-call="report.internal_layout">
<div class="page">
<div class="text-center">
<h3 class="text-center"><strong>Yearly Salary Details</strong></h3>
<p class="text-center">
<h2>Yearly Salary Details</h2>
<p>
From <u><span t-esc="formatLang(data['form']['start_date'], date=True)"/></u> To <u><span t-esc="formatLang(data['form']['end_date'], date=True)"/></u> of <u><span t-esc="data['form']['category_id'][1]"/></u> Category
</p>
</div>