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

[IMP] l10n_fr_hr_payroll: few fixes/code enhancement 

bzr revid: qdp-launchpad@openerp.com-20120516140301-p65l3gk3dt1q9ire
This commit is contained in:
Quentin (OpenERP) 2012-05-16 16:03:01 +02:00
parent ea82e137a5
commit d598901ad2
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/l10n_fr/l10n_fr_view.xml
View File

@ -10,7 +10,7 @@
<field name="inherit_id" ref="base.view_company_form"/> <field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<data> <data>
<xpath expr="/form/notebook/page[@string='General Information']/field[@name='company_registry']" position="after"> <xpath expr="//field[@name='company_registry']" position="after">
<field name="siret"/> <field name="siret"/>
<field name="ape"/> <field name="ape"/>
</xpath> </xpath>

2
addons/l10n_fr_hr_payroll/__openerp__.py
View File

@ -22,7 +22,7 @@
'name': 'French Payroll', 'name': 'French Payroll',
'category': 'Localization/Payroll', 'category': 'Localization/Payroll',
'author': 'Yannick Buron (SYNERPGY)', 'author': 'Yannick Buron (SYNERPGY)',
'depends': ['hr_payroll', 'hr_payroll_account', 'l10n_fr'], 'depends': ['hr_payroll', 'l10n_fr'],
'version': '1.0', 'version': '1.0',
'description': """ 'description': """
French Payroll Rules French Payroll Rules

6
addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_view.xml
View File

@ -11,7 +11,7 @@
<field name="inherit_id" ref="base.view_company_form"/> <field name="inherit_id" ref="base.view_company_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<data> <data>
<xpath expr="/form/notebook/page[@string='Configuration']" position="after"> <xpath expr="//notebook" position="inside">
<page string="Paye"> <page string="Paye">
<field name="plafond_secu"/> <field name="plafond_secu"/>
<field name="nombre_employes"/> <field name="nombre_employes"/>
@ -48,7 +48,7 @@
<field name="inherit_id" ref="hr_payroll.view_hr_payslip_form"/> <field name="inherit_id" ref="hr_payroll.view_hr_payslip_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<data> <data>
<xpath expr="/form/notebook/page[@string='Other Information']/group/field[@name='paid']" position="after"> <xpath expr="//field[@name='paid']" position="after">
<field name="payment_mode"/> <field name="payment_mode"/>
</xpath> </xpath>
</data> </data>
@ -63,7 +63,7 @@
model="hr.payslip" model="hr.payslip"
name="fiche.paye" name="fiche.paye"
rml="l10n_fr_hr_payroll/report/fiche_paye.rml" rml="l10n_fr_hr_payroll/report/fiche_paye.rml"
string="Fiche de Paye" /> string="Fiche de Paie" />
</data> </data>

20
addons/l10n_fr_hr_payroll/report/fiche_paye.py
View File

@ -34,13 +34,13 @@ class fiche_paye_parser(report_sxw.rml_parse):
'get_employer_line': self.get_employer_line, 'get_employer_line': self.get_employer_line,
}) })
def get_payslip_lines(self, obj): def get_payslip_lines(self, objs):
payslip_line = self.pool.get('hr.payslip.line') payslip_line = self.pool.get('hr.payslip.line')
res = [] res = []
ids = [] ids = []
for id in range(len(obj)): for item in objs:
if obj[id].appears_on_payslip == True and not obj[id].salary_rule_id.parent_rule_id : if item.appears_on_payslip == True and not item.salary_rule_id.parent_rule_id :
ids.append(obj[id].id) ids.append(item.id)
if ids: if ids:
res = payslip_line.browse(self.cr, self.uid, ids) res = payslip_line.browse(self.cr, self.uid, ids)
return res return res
@ -53,20 +53,20 @@ class fiche_paye_parser(report_sxw.rml_parse):
cate_ids = rule_cate_obj.search(self.cr, self.uid, [('code', '=', code)]) cate_ids = rule_cate_obj.search(self.cr, self.uid, [('code', '=', code)])
category_total = 0 category_total = 0
line_ids = payslip_line.search(self.cr, self.uid, [('slip_id', '=', obj.id),('category_id.id', '=', cate_ids[0] )]) if cate_ids:
line_ids = payslip_line.search(self.cr, self.uid, [('slip_id', '=', obj.id),('category_id.id', '=', cate_ids[0] )])
for line in payslip_line.browse(self.cr, self.uid, line_ids): for line in payslip_line.browse(self.cr, self.uid, line_ids):
category_total += line.total category_total += line.total
return category_total return category_total
def get_employer_line(self, obj, parent_line): def get_employer_line(self, obj, parent_line):
payslip_line = self.pool.get('hr.payslip.line') payslip_line = self.pool.get('hr.payslip.line')
line_ids = payslip_line.search(self.cr, self.uid, [('slip_id', '=', obj.id), ('salary_rule_id.parent_rule_id.id', '=', parent_line.salary_rule_id.id )]) line_ids = payslip_line.search(self.cr, self.uid, [('slip_id', '=', obj.id), ('salary_rule_id.parent_rule_id.id', '=', parent_line.salary_rule_id.id )])
res = payslip_line.browse(self.cr, self.uid, line_ids[0]) res = line_ids and payslip_line.browse(self.cr, self.uid, line_ids[0]) or False
return res return res