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

[IMP]: Remove the inline CSS

Browse Source 
bzr revid: rsi@tinyerp.com-20140422120915-wpkrw1v1zmjugx5d
This commit is contained in:
Rakesh Sindhav (OpenERP)
2014-04-22 17:39:15 +05:30
parent 2e67cf77de
commit 166f735ce5
6 changed files with 81 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/l10n_in_hr_payroll/__openerp__.py
+1 -1
View File
@@ -49,7 +49,7 @@ Indian Payroll Salary Rules.
'security/ir.model.access.csv',
'l10n_in_hr_payroll_report.xml',
'l10n_in_hr_payroll_sequence.xml',
'views/report_hr_salary_employee_bymonth.xml',
'views/report_hrsalarybymonth.xml',
'wizard/hr_salary_employee_bymonth_view.xml',
'wizard/hr_yearly_salary_detail_view.xml',
'report/payment_advice_report_view.xml',
addons/l10n_in_hr_payroll/l10n_in_hr_payroll_report.xml
+3 -3
View File
@@ -19,12 +19,12 @@
string="Print Advice" />
<report
id="hr_salary_employee_bymonth"
id="hr_salary_bymonth"
string="Yearly Salary by Head"
model="hr.salary.employee.month"
report_type="qweb-pdf"
file="l10n_in_hr_payroll.employee_salary_bymonth"
name="l10n_in_hr_payroll.employee_salary_bymonth"/>
file="l10n_in_hr_payroll.report_hrsalarybymonth"
name="l10n_in_hr_payroll.report_hrsalarybymonth"/>
<report
auto="False"
addons/l10n_in_hr_payroll/report/report_hr_salary_employee_bymonth.py
+2 -2
View File
@@ -129,9 +129,9 @@ class report_hr_salary_employee_bymonth(report_sxw.rml_parse):
return self.total
class employee_salary_bymonth(osv.AbstractModel):
_name = 'report.l10n_in_hr_payroll.employee_salary_bymonth'
_name = 'report.l10n_in_hr_payroll.report_hrsalarybymonth'
_inherit = 'report.abstract_report'
_template = 'l10n_in_hr_payroll.employee_salary_bymonth'
_template = 'l10n_in_hr_payroll.report_hrsalarybymonth'
_wrapped_report_class = report_hr_salary_employee_bymonth
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/l10n_in_hr_payroll/views/report_hr_salary_employee_bymonth.xml
-75
View File
@@ -1,75 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<template id="employee_salary_bymonth">
<t t-call="report.html_container">
<t t-call="report.internal_layout">
<hr/>
<div class="page">
<h4 class="text-center" style="font-famaly:Helvetica;font-weight:bold;">Yearly Salary Details</h4>
<div class="text-center">
<h5 style="font-famaly:Helvetica;">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</h5>
</div>
<table class="table">
<tr style="border-top:black solid 2px;border-bottom:black solid 2px;font-family:Helvetica;font-size:12;margin:0">
<th class="text-left">Name</th>
<t t-foreach="get_periods(data['form'])" t-as="m">
<th class="text-right" t-esc="m[0]"/>
<th class="text-right" t-esc="m[1]"/>
<th class="text-right" t-esc="m[2]"/>
<th class="text-right" t-esc="m[3]"/>
<th class="text-right" t-esc="m[4]"/>
<th class="text-right" t-esc="m[5]"/>
<th class="text-right" t-esc="m[6]"/>
<th class="text-right" t-esc="m[7]"/>
<th class="text-right" t-esc="m[8]"/>
<th class="text-right" t-esc="m[9]"/>
<th class="text-right" t-esc="m[10]"/>
<th class="text-right" t-esc="m[11]"/>
</t>
<th class="text-right">Total</th>
</tr>
<t t-foreach="get_employee(data['form'])" t-as="e">
<tr style="font-family:Helvetica;font-size:9;margin:0">
<td class="text-left" t-esc="e[0]"></td>
<td class="text-right" t-esc="e[1]"></td>
<td class="text-right" t-esc="e[2]"></td>
<td class="text-right" t-esc="e[3]"></td>
<td class="text-right" t-esc="e[4]"></td>
<td class="text-right" t-esc="e[5]"></td>
<td class="text-right" t-esc="e[6]"></td>
<td class="text-right" t-esc="e[7]"></td>
<td class="text-right" t-esc="e[8]"></td>
<td class="text-right" t-esc="e[9]"></td>
<td class="text-right" t-esc="e[10]"></td>
<td class="text-right" t-esc="e[11]"></td>
<td class="text-right" t-esc="e[12]"></td>
<th class="text-right" t-esc="formatLang(e[13],currency_obj= company.currency_id)"></th>
</tr>
</t>
<tr style="border-top:black solid 2px;font-family:Helvetica;font-size:12;margin:0">
<t t-foreach="get_months_tol()" t-as="t">
<th class="text-left"><font face="Helvetica" size="5.0"><t t-esc="t[0]"></t></font></th>
<th class="text-right" t-esc="formatLang(t[1],currency_obj= company.currency_id)"></th>
<th class="text-right" t-esc="formatLang(t[2],currency_obj= company.currency_id)"></th>
<th class="text-right" t-esc="formatLang(t[3],currency_obj= company.currency_id)"></th>
<th class="text-right" t-esc="formatLang(t[4],currency_obj= company.currency_id)"></th>
<th class="text-right" t-esc="formatLang(t[5],currency_obj= company.currency_id)"></th>
<th class="text-right" t-esc="formatLang(t[6],currency_obj= company.currency_id)"></th>
<th class="text-right" t-esc="formatLang(t[7],currency_obj= company.currency_id)"></th>
<th class="text-right" t-esc="formatLang(t[8],currency_obj= company.currency_id)"></th>
<th class="text-right" t-esc="formatLang(t[9],currency_obj= company.currency_id)"></th>
<th class="text-right" t-esc="formatLang(t[10],currency_obj= company.currency_id)"></th>
<th class="text-right" t-esc="formatLang(t[11],currency_obj= company.currency_id)"></th>
<th class="text-right" t-esc="formatLang(t[12],currency_obj= company.currency_id)"></th>
</t>
<th class="text-right small" t-esc="formatLang(get_total(),currency_obj= company.currency_id)"></th>
</tr>
</table>
</div>
</t>
</t>
</template>
</data>
</openerp>
addons/l10n_in_hr_payroll/views/report_hrsalarybymonth.xml
+74
View File
@@ -0,0 +1,74 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<template id="report_hrsalarybymonth">
<t t-call="report.html_container">
<t t-call="report.internal_layout">
<div class="page">
<div class="text-center">
<h4 class="text-center"><strong>Yearly Salary Details</strong></h4>
<h5>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</h5>
</div>
<table class="table table-condensed">
<tr>
<th>Name</th>
<t t-foreach="get_periods(data['form'])" t-as="m">
<th class="text-right" t-esc="m[0]" />
<th class="text-right" t-esc="m[1]" />
<th class="text-right" t-esc="m[2]" />
<th class="text-right" t-esc="m[3]" />
<th class="text-right" t-esc="m[4]" />
<th class="text-right" t-esc="m[5]" />
<th class="text-right" t-esc="m[6]" />
<th class="text-right" t-esc="m[7]" />
<th class="text-right" t-esc="m[8]" />
<th class="text-right" t-esc="m[9]" />
<th class="text-right" t-esc="m[10]" />
<th class="text-right" t-esc="m[11]" />
</t>
<th class="text-right">Total</th>
</tr>
<t t-foreach="get_employee(data['form'])" t-as="e">
<tr>
<td t-esc="e[0]" />
<td class="text-right" t-esc="e[1]" />
<td class="text-right" t-esc="e[2]" />
<td class="text-right" t-esc="e[3]" />
<td class="text-right" t-esc="e[4]" />
<td class="text-right" t-esc="e[5]" />
<td class="text-right" t-esc="e[6]" />
<td class="text-right" t-esc="e[7]" />
<td class="text-right" t-esc="e[8]" />
<td class="text-right" t-esc="e[9]" />
<td class="text-right" t-esc="e[10]" />
<td class="text-right" t-esc="e[11]" />
<td class="text-right" t-esc="e[12]" />
<th class="text-right" t-esc="formatLang(e[13],currency_obj= company.currency_id)" />
</tr>
</t>
<tr>
<t t-foreach="get_months_tol()" t-as="t">
<th t-esc="t[0]" />
<th class="text-right" t-esc="formatLang(t[1], currency_obj=company.currency_id)" />
<th class="text-right" t-esc="formatLang(t[2], currency_obj=company.currency_id)" />
<th class="text-right" t-esc="formatLang(t[3], currency_obj=company.currency_id)" />
<th class="text-right" t-esc="formatLang(t[4], currency_obj=company.currency_id)" />
<th class="text-right" t-esc="formatLang(t[5], currency_obj=company.currency_id)" />
<th class="text-right" t-esc="formatLang(t[6], currency_obj=company.currency_id)" />
<th class="text-right" t-esc="formatLang(t[7], currency_obj=company.currency_id)" />
<th class="text-right" t-esc="formatLang(t[8], currency_obj=company.currency_id)" />
<th class="text-right" t-esc="formatLang(t[9], currency_obj=company.currency_id)" />
<th class="text-right" t-esc="formatLang(t[10], currency_obj=company.currency_id)" />
<th class="text-right" t-esc="formatLang(t[11], currency_obj=company.currency_id)" />
<th class="text-right" t-esc="formatLang(t[12], currency_obj=company.currency_id)" />
</t>
<th class="text-right" t-esc="formatLang(get_total(), currency_obj=company.currency_id)" />
</tr>
</table>
</div>
</t>
</t>
</template>
</data>
</openerp>
addons/l10n_in_hr_payroll/wizard/hr_salary_employee_bymonth.py
+1 -1
View File
@@ -60,7 +60,7 @@ class hr_salary_employee_bymonth(osv.osv_memory):
res = res and res[0] or {}
datas.update({'form': res})
return self.pool['report'].get_action(cr, uid, ids,
'l10n_in_hr_payroll.employee_salary_bymonth',
'l10n_in_hr_payroll.report_hrsalarybymonth',
data=datas, context=context)
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: