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

[IMP] hr_payroll: contribution report improvemnt as specified in need fixing 

bzr revid: psi@tinyerp.co.in-20110527073256-d6v6voa6ssw9fykg
This commit is contained in:
psi (Open ERP) 2011-05-27 13:02:56 +05:30
parent 908462ec0f
commit 998c0f641f
5 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/hr_payroll/hr_payroll.py
View File

@ -309,7 +309,7 @@ class hr_payslip(osv.osv):
def hr_verify_sheet(self, cr, uid, ids, context=None):
return self.write(cr, uid, ids, {'state': 'verify'}, context=context)
def refund_sheet(self, cr, uid, ids, context=None):
mod_obj = self.pool.get('ir.model.data')
wf_service = netsvc.LocalService("workflow")
@ -759,7 +759,7 @@ class hr_salary_rule(osv.osv):
'amount_python_compute':fields.text('Python Code'),
'amount_percentage_base':fields.char('Percentage based on',size=1024, required=False, readonly=False, help='result will be affected to a variable'),
'child_ids':fields.one2many('hr.salary.rule', 'parent_rule_id', 'Child Salary Rule'),
'register_id':fields.many2one('hr.contribution.register', 'Contribution Register', help="Contribution register based on company", required=False),
'register_id':fields.many2one('hr.contribution.register', 'Contribution Register', help="Contribution register based on company"),
'input_ids': fields.one2many('hr.rule.input', 'input_id', 'Inputs'),
'note':fields.text('Description'),
}

2
addons/hr_payroll/report/report_contribution_register.py
View File

@ -27,7 +27,6 @@ from datetime import datetime
from dateutil import relativedelta
from report import report_sxw
from tools.safe_eval import safe_eval as eval
class contribution_register_report(report_sxw.rml_parse):
def __init__(self, cr, uid, name, context):
@ -48,7 +47,6 @@ class contribution_register_report(report_sxw.rml_parse):
def _get_payslip_lines(self, obj):
payslip_obj = self.pool.get('hr.payslip')
payslip_line = self.pool.get('hr.payslip.line')
localdict = {}
res = []
result = {}
self.regi_total = 0.0

4
addons/hr_payroll/report/report_contribution_register.rml
View File

@ -81,7 +81,7 @@
<paraStyle name="P10" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
<paraStyle name="P11" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT"/>
<paraStyle name="P12" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P13" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P13" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="RIGHT" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P14" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
<paraStyle name="P15" fontName="Helvetica" fontSize="2.0" leading="3" alignment="LEFT"/>
<paraStyle name="P16" fontName="Helvetica" fontSize="2.0" leading="3"/>
@ -209,7 +209,7 @@
</tr>
</blockTable>
</section>
<blockTable colWidths="465.0,74.0" style="Table5">
<blockTable colWidths="479.0,60.0" style="Table5">
<tr>
<td>
<para style="P13">Total:</para>

7
addons/hr_payroll/wizard/hr_payroll_cotribution_register_report.py
View File

@ -39,17 +39,16 @@ class payslip_lines_contribution_register(osv.osv_memory):
}
def print_report(self, cr, uid, ids, context=None):
data = self.read(cr, uid, ids, [], context=context)[0]
datas = {
'ids': context.get('active_ids', []),
'model': 'hr.contribution.register',
'form': data
}
'form': self.read(cr, uid, ids, [], context=context)[0]
}
return {
'type': 'ir.actions.report.xml',
'report_name': 'contribution.register.lines',
'datas': datas,
}
}
payslip_lines_contribution_register()

2
addons/hr_payroll/wizard/hr_payroll_cotribution_register_report.xml
View File

@ -31,7 +31,7 @@
<field name="target">new</field>
</record>
<record model="ir.values" id="hr_holidays_summary_employee_value">
<record model="ir.values" id="payslip_lines_contribution_register_value">
<field name="model_id" ref="model_hr_contribution_register" />
<field name="object" eval="1" />
<field name="name">PaySlip Lines</field>