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

[FIX]l10n_in_hr_payroll:report name changed,file name changed,rml improved

Browse Source 
bzr revid: kbh@tinyerp.com-20120803091729-sal3w4dltoxbxu5w
This commit is contained in:
Khushboo Bhatt (Open ERP)
2012-08-03 14:47:29 +05:30
parent 498f0ae6ea
commit 2386cb96c9
8 changed files with 50 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/l10n_in_hr_payroll/__openerp__.py
+1 -1
View File
@@ -51,7 +51,7 @@ Indian Payroll Salary Rules.
'l10n_in_hr_payroll_report.xml',
'l10n_in_hr_payroll_sequence.xml',
'wizard/hr_salary_employee_bymonth_view.xml',
'wizard/yearly_salary_detail_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
+2 -2
View File
@@ -31,8 +31,8 @@
id="yearly_salary"
model="yearly.salary.detail"
name="salary.detail.byyear"
rml="l10n_in_hr_payroll/report/report_yearly_salary_detail.rml"
string="Yearly Salary Report" />
rml="l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml"
string="Payroll Register" />
</data>
</openerp>
addons/l10n_in_hr_payroll/report/__init__.py
+1 -1
View File
@@ -26,6 +26,6 @@ import report_payslip_details
import report_payroll_advice
import report_hr_salary_employee_bymonth
import payment_advice_report
import report_yearly_salary_detail
import report_hr_yearly_salary_detail
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/l10n_in_hr_payroll/report/report_yearly_salary_detail.py → addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.py
+11 -10
View File
@@ -46,6 +46,7 @@ class employees_yearly_salary_report(report_sxw.rml_parse):
self.total = 0.00
def get_periods(self, form):
self.mnths =[]
# Get start year-month-date and end year-month-date
first_year = int(form['date_from'][0:4])
last_year = int(form['date_to'][0:4])
@@ -86,8 +87,9 @@ class employees_yearly_salary_report(report_sxw.rml_parse):
#for Basic Salary
res = self.cal_monthly_amt(form, obj.id)
basic = res[0]
self.total += basic[0][len(basic[0])-1]
self.allow_list.append(basic[0])
if basic:
self.total += basic[0][len(basic[0])-1]
self.allow_list.append(basic[0])
#for allowance
allow = res[1]
@@ -95,8 +97,9 @@ class employees_yearly_salary_report(report_sxw.rml_parse):
for i in range(1, len(allow)+1):
self.allow_list.append(allow[i-1])
self.total += allow[i-1][len(allow[i-1])-1]
self.total += gross[0][len(gross[0])-1]
self.allow_list.append(gross[0])
if gross:
self.total += gross[0][len(gross[0])-1]
self.allow_list.append(gross[0])
#for Deduction
deduct = res[2]
@@ -104,8 +107,9 @@ class employees_yearly_salary_report(report_sxw.rml_parse):
for i in range(1, len(deduct)+1):
self.deduct_list.append(deduct[i-1])
self.total -= deduct[i-1][len(deduct[i-1])-1]
self.total += net[0][len(net[0])-1]
self.deduct_list.append(net[0])
if net:
self.total += net[0][len(net[0])-1]
self.deduct_list.append(net[0])
return None
def cal_monthly_amt(self, form, emp_id):
@@ -185,11 +189,9 @@ class employees_yearly_salary_report(report_sxw.rml_parse):
return result
def salary_list(self, salaries):
cnt = 0
cat_salary_all = []
for category_name,amount in salaries.items():
cat_salary = []
cnt += 1
tot = 0.0
cat_salary.append(category_name)
for mnth in self.mnths:
@@ -205,7 +207,6 @@ class employees_yearly_salary_report(report_sxw.rml_parse):
cat_salary.append('')
cat_salary.append(tot)
cat_salary_all.append(cat_salary)
cnt = 1
return cat_salary_all
def get_allow(self):
@@ -217,6 +218,6 @@ class employees_yearly_salary_report(report_sxw.rml_parse):
def get_total(self):
return self.total
report_sxw.report_sxw('report.salary.detail.byyear', 'yearly.salary.detail', 'hr_payroll/report/report_yearly_salary_detail.rml', parser=employees_yearly_salary_report, header='internal landscape')
report_sxw.report_sxw('report.salary.detail.byyear', 'yearly.salary.detail', 'hr_payroll/report/report_hr_yearly_salary_detail.rml', parser=employees_yearly_salary_report, header='internal landscape')
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/l10n_in_hr_payroll/report/report_yearly_salary_detail.rml → addons/l10n_in_hr_payroll/report/report_hr_yearly_salary_detail.rml
+32 -31
View File
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<document filename="test.pdf">
<template pageSize="(842.0,595.0)" title="Test" author="Martin Simon" allowSplitting="20">
<document filename="hr_yearly_salary_detail_report.pdf">
<template pageSize="(842.0,595.0)" title="hr_yearly_salary_detail_report" author="Openerp S.A." allowSplitting="20">
<pageTemplate id="first">
<frame id="first" x1="28.0" y1="57.0" width="786" height="481"/>
</pageTemplate>
@@ -252,7 +252,7 @@
<paraStyle name="terp_default_Centre_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Right_9" fontName="Helvetica" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_1" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="9.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_Right_9_Bold" fontName="Helvetica-Bold" fontSize="7.0" leading="11" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_8_Italic" fontName="Helvetica-Oblique" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="terp_default_space" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="9.0" spaceAfter="0.0"/>
<images/>
@@ -340,8 +340,9 @@
<font color="white"> </font>
</para>
<section>
<para style="terp_default_1">[[ repeatIn(get_periods(data['form']),'m') ]] [[ get_employee_detail((data['form']),o) ]]</para>
<blockTable colWidths="180.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,52.0" style="Table4">
<para style="terp_default_1">[[ repeatIn(get_periods(data['form']),'m') ]]</para>
<para style="terp_default_1">[[ get_employee_detail((data['form']),o) ]]</para>
<blockTable colWidths="195.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,56.0" style="Table4">
<tr>
<td>
<para style="terp_tblheader_Details">Title</para>
@@ -400,69 +401,69 @@
</blockTable>
<section>
<para style="terp_default_1">[[ repeatIn(get_allow(),'e1') ]]</para>
<blockTable colWidths="180.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,52.0" style="Table6">
<blockTable colWidths="195.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,56.0" style="Table6">
<tr>
<td>
<para style="terp_default_9">[[ e1[0] ]]</para>
</td>
<td>
<para style="terp_default_Right_8">
<font face="Helvetica" size="9.0">[[ (e1[1]!='' and formatLang(e1[1])) or removeParentNode('font') ]]</font>
<font face="Helvetica" size="7.0">[[ (e1[1]!='' and formatLang(e1[1])) or removeParentNode('font') ]]</font>
</para>
</td>
<td>
<para style="terp_default_Right_8">
<font face="Helvetica" size="9.0">[[ (e1[2]!='' and formatLang(e1[2])) or removeParentNode('font') ]]</font>
<font face="Helvetica" size="7.0">[[ (e1[2]!='' and formatLang(e1[2])) or removeParentNode('font') ]]</font>
</para>
</td>
<td>
<para style="terp_default_Right_8">
<font face="Helvetica" size="9.0">[[ (e1[3]!='' and formatLang(e1[3])) or removeParentNode('font') ]]</font>
<font face="Helvetica" size="7.0">[[ (e1[3]!='' and formatLang(e1[3])) or removeParentNode('font') ]]</font>
</para>
</td>
<td>
<para style="terp_default_Right_8">
<font face="Helvetica" size="9.0">[[ (e1[4]!='' and formatLang(e1[4])) or removeParentNode('font') ]]</font>
<font face="Helvetica" size="7.0">[[ (e1[4]!='' and formatLang(e1[4])) or removeParentNode('font') ]]</font>
</para>
</td>
<td>
<para style="terp_default_Right_8">
<font face="Helvetica" size="9.0">[[ (e1[5]!='' and formatLang(e1[5])) or removeParentNode('font') ]]</font>
<font face="Helvetica" size="7.0">[[ (e1[5]!='' and formatLang(e1[5])) or removeParentNode('font') ]]</font>
</para>
</td>
<td>
<para style="terp_default_Right_8">
<font face="Helvetica" size="9.0">[[ (e1[6]!='' and formatLang(e1[6])) or removeParentNode('font') ]]</font>
<font face="Helvetica" size="7.0">[[ (e1[6]!='' and formatLang(e1[6])) or removeParentNode('font') ]]</font>
</para>
</td>
<td>
<para style="terp_default_Right_8">
<font face="Helvetica" size="9.0">[[ (e1[7]!='' and formatLang(e1[7])) or removeParentNode('font') ]]</font>
<font face="Helvetica" size="7.0">[[ (e1[7]!='' and formatLang(e1[7])) or removeParentNode('font') ]]</font>
</para>
</td>
<td>
<para style="terp_default_Right_8">
<font face="Helvetica" size="9.0">[[ (e1[8]!='' and formatLang(e1[8])) or removeParentNode('font') ]]</font>
<font face="Helvetica" size="7.0">[[ (e1[8]!='' and formatLang(e1[8])) or removeParentNode('font') ]]</font>
</para>
</td>
<td>
<para style="terp_default_Right_8">
<font face="Helvetica" size="9.0">[[ (e1[9]!='' and formatLang(e1[9])) or removeParentNode('font') ]]</font>
<font face="Helvetica" size="7.0">[[ (e1[9]!='' and formatLang(e1[9])) or removeParentNode('font') ]]</font>
</para>
</td>
<td>
<para style="terp_default_Right_8">
<font face="Helvetica" size="9.0">[[ (e1[10]!='' and formatLang(e1[10])) or removeParentNode('font') ]]</font>
<font face="Helvetica" size="7.0">[[ (e1[10]!='' and formatLang(e1[10])) or removeParentNode('font') ]]</font>
</para>
</td>
<td>
<para style="terp_default_Right_8">
<font face="Helvetica" size="9.0">[[ (e1[11]!='' and formatLang(e1[11])) or removeParentNode('font') ]]</font>
<font face="Helvetica" size="7.0">[[ (e1[11]!='' and formatLang(e1[11])) or removeParentNode('font') ]]</font>
</para>
</td>
<td>
<para style="terp_default_Right_8">
<font face="Helvetica" size="9.0">[[ (e1[12]!='' and formatLang(e1[12])) or removeParentNode('font') ]]</font>
<font face="Helvetica" size="7.0">[[ (e1[12]!='' and formatLang(e1[12])) or removeParentNode('font') ]]</font>
</para>
</td>
<td>
@@ -480,69 +481,69 @@
</blockTable>
<section>
<para style="terp_default_1">[[ repeatIn(get_deduct(),'e2') ]]</para>
<blockTable colWidths="180.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,52.0" style="Table8">
<blockTable colWidths="195.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,46.0,56.0" style="Table8">
<tr>
<td>
<para style="terp_default_9">[[ e2[0] ]]</para>
</td>
<td>
<para style="terp_default_Right_8">
<font face="Helvetica" size="9.0">[[ (e2[1]!='' and formatLang(e2[1])) or removeParentNode('font') ]]</font>
<font face="Helvetica" size="7.0">[[ (e2[1]!='' and formatLang(e2[1])) or removeParentNode('font') ]]</font>
</para>
</td>
<td>
<para style="terp_default_Right_8">
<font face="Helvetica" size="9.0">[[ (e2[2]!='' and formatLang(e2[2])) or removeParentNode('font') ]]</font>
<font face="Helvetica" size="7.0">[[ (e2[2]!='' and formatLang(e2[2])) or removeParentNode('font') ]]</font>
</para>
</td>
<td>
<para style="terp_default_Right_8">
<font face="Helvetica" size="9.0">[[ (e2[3]!='' and formatLang(e2[3])) or removeParentNode('font') ]]</font>
<font face="Helvetica" size="7.0">[[ (e2[3]!='' and formatLang(e2[3])) or removeParentNode('font') ]]</font>
</para>
</td>
<td>
<para style="terp_default_Right_8">
<font face="Helvetica" size="9.0">[[ (e2[4]!='' and formatLang(e2[4])) or removeParentNode('font') ]]</font>
<font face="Helvetica" size="7.0">[[ (e2[4]!='' and formatLang(e2[4])) or removeParentNode('font') ]]</font>
</para>
</td>
<td>
<para style="terp_default_Right_8">
<font face="Helvetica" size="9.0">[[ (e2[5]!='' and formatLang(e2[5])) or removeParentNode('font') ]]</font>
<font face="Helvetica" size="7.0">[[ (e2[5]!='' and formatLang(e2[5])) or removeParentNode('font') ]]</font>
</para>
</td>
<td>
<para style="terp_default_Right_8">
<font face="Helvetica" size="9.0">[[ (e2[6]!='' and formatLang(e2[6])) or removeParentNode('font') ]]</font>
<font face="Helvetica" size="7.0">[[ (e2[6]!='' and formatLang(e2[6])) or removeParentNode('font') ]]</font>
</para>
</td>
<td>
<para style="terp_default_Right_8">
<font face="Helvetica" size="9.0">[[ (e2[7]!='' and formatLang(e2[7])) or removeParentNode('font') ]]</font>
<font face="Helvetica" size="7.0">[[ (e2[7]!='' and formatLang(e2[7])) or removeParentNode('font') ]]</font>
</para>
</td>
<td>
<para style="terp_default_Right_8">
<font face="Helvetica" size="9.0">[[ (e2[8]!='' and formatLang(e2[8])) or removeParentNode('font') ]]</font>
<font face="Helvetica" size="7.0">[[ (e2[8]!='' and formatLang(e2[8])) or removeParentNode('font') ]]</font>
</para>
</td>
<td>
<para style="terp_default_Right_8">
<font face="Helvetica" size="9.0">[[ (e2[9]!='' and formatLang(e2[9])) or removeParentNode('font') ]]</font>
<font face="Helvetica" size="7.0">[[ (e2[9]!='' and formatLang(e2[9])) or removeParentNode('font') ]]</font>
</para>
</td>
<td>
<para style="terp_default_Right_8">
<font face="Helvetica" size="9.0">[[ (e2[10]!='' and formatLang(e2[10])) or removeParentNode('font') ]]</font>
<font face="Helvetica" size="7.0">[[ (e2[10]!='' and formatLang(e2[10])) or removeParentNode('font') ]]</font>
</para>
</td>
<td>
<para style="terp_default_Right_8">
<font face="Helvetica" size="9.0">[[ (e2[11]!='' and formatLang(e2[11])) or removeParentNode('font') ]]</font>
<font face="Helvetica" size="7.0">[[ (e2[11]!='' and formatLang(e2[11])) or removeParentNode('font') ]]</font>
</para>
</td>
<td>
<para style="terp_default_Right_8">
<font face="Helvetica" size="9.0">[[ (e2[12]!='' and formatLang(e2[12])) or removeParentNode('font') ]]</font>
<font face="Helvetica" size="7.0">[[ (e2[12]!='' and formatLang(e2[12])) or removeParentNode('font') ]]</font>
</para>
</td>
<td>
addons/l10n_in_hr_payroll/wizard/__init__.py
+1 -1
View File
@@ -20,6 +20,6 @@
##############################################################################
import hr_salary_employee_bymonth
import yearly_salary_detail
import hr_yearly_salary_detail
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
addons/l10n_in_hr_payroll/wizard/yearly_salary_detail.py → addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail.py
View File
addons/l10n_in_hr_payroll/wizard/yearly_salary_detail_view.xml → addons/l10n_in_hr_payroll/wizard/hr_yearly_salary_detail_view.xml
+2 -2
View File
@@ -23,7 +23,7 @@
</record>
<record id="action_yearly_salary_detail" model="ir.actions.act_window">
<field name="name">Employee Yearly Salary</field>
<field name="name">Payroll Register</field>
<field name="type">ir.actions.act_window</field>
<field name="res_model">yearly.salary.detail</field>
<field name="view_type">form</field>
@@ -32,7 +32,7 @@
</record>
<menuitem
name="Employee Salary Statement"
name="Payroll Register"
parent="hr.menu_hr_reporting_timesheet"
action="action_yearly_salary_detail"
sequence="250" icon="STOCK_PRINT"