diff --git a/addons/l10n_fr_hr_payroll/__openerp__.py b/addons/l10n_fr_hr_payroll/__openerp__.py index eb9ede34570..f7ea758d53a 100644 --- a/addons/l10n_fr_hr_payroll/__openerp__.py +++ b/addons/l10n_fr_hr_payroll/__openerp__.py @@ -48,6 +48,8 @@ TODO: 'data': [ 'l10n_fr_hr_payroll_view.xml', 'l10n_fr_hr_payroll_data.xml', + 'views/report_l10nfrfichepaye.xml', + 'l10n_fr_hr_payroll_reports.xml', ], 'installable': True } diff --git a/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_reports.xml b/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_reports.xml new file mode 100644 index 00000000000..7e992fabffb --- /dev/null +++ b/addons/l10n_fr_hr_payroll/l10n_fr_hr_payroll_reports.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/addons/l10n_fr_hr_payroll/report/fiche_paye.py b/addons/l10n_fr_hr_payroll/report/fiche_paye.py index daa7c6fd6ac..c6933228687 100755 --- a/addons/l10n_fr_hr_payroll/report/fiche_paye.py +++ b/addons/l10n_fr_hr_payroll/report/fiche_paye.py @@ -22,8 +22,10 @@ # ############################################################################## +from openerp.osv import osv from openerp.report import report_sxw + class fiche_paye_parser(report_sxw.rml_parse): def __init__(self, cr, uid, name, context): @@ -45,7 +47,6 @@ class fiche_paye_parser(report_sxw.rml_parse): res = payslip_line.browse(self.cr, self.uid, ids) return res - def get_total_by_rule_category(self, obj, code): payslip_line = self.pool.get('hr.payslip.line') rule_cate_obj = self.pool.get('hr.salary.rule.category') @@ -60,9 +61,7 @@ class fiche_paye_parser(report_sxw.rml_parse): return category_total - def get_employer_line(self, obj, parent_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 )]) @@ -71,6 +70,10 @@ class fiche_paye_parser(report_sxw.rml_parse): return res -report_sxw.report_sxw('report.fiche.paye', 'hr.payslip', 'l10n_fr_hr_payroll/report/fiche_paye.rml', parser=fiche_paye_parser) +class wrapped_report_fiche_paye(osv.AbstractModel): + _name = 'report.l10n_fr_hr_payroll.report_l10nfrfichepaye' + _inherit = 'report.abstract_report' + _template = 'l10n_fr_hr_payroll.report_l10nfrfichepaye' + _wrapped_report_class = fiche_paye_parser # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_fr_hr_payroll/report/fiche_paye.rml b/addons/l10n_fr_hr_payroll/report/fiche_paye.rml deleted file mode 100644 index 2d1a6bff8b2..00000000000 --- a/addons/l10n_fr_hr_payroll/report/fiche_paye.rml +++ /dev/null @@ -1,447 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [[repeatIn(objects,'o')]] - - - - - - - BULLETIN DE PAIE - - - - PAIE DU [[ formatLang(o.date_from, date=True) or '']] AU [[ formatLang(o.date_to, date=True) or '' ]] - - - - Matricule : - N° s.s : - Emploi : - Qualif : - Niveau : - Coef : - Entrée : - - - [[o.employee_id.sinid or '_']] - [[o.employee_id.ssnid or '_']] - [[o.contract_id.job_id.name or '_']] - [[o.contract_id.qualif or '_']] - [[o.contract_id.niveau or '_']] - [[o.contract_id.coef or '_']] - [[o.contract_id.date_start or '_']] Sortie : [[o.contract_id.date_end or '']] - - - - - ORG. S.S : - - - [[o.employee_id.company_id.org_ss or '_']] - - - - - - - - - - - - - - - - - [[o.employee_id.company_id.partner_id.title.name or '']] [[o.employee_id.company_id.name or '_']] - [[o.employee_id.company_id.street or '_']] - [[o.employee_id.company_id.street2 or '']] - [[o.employee_id.company_id.zip or '_']] [[o.employee_id.company_id.city or '']] - SIRET : [[o.employee_id.company_id.siret or '_']] APE : [[o.employee_id.company_id.ape or '_']] - - - - - - - - - - - - - - - - [[o.employee_id.name or '_']] - [[display_address(o.employee_id.address_home_id) or '_' ]] - - - - - - - - - - - - - - - - - - - DESIGNATION - - - QUANTITE / BASE - - - TAUX - - - MONTANT - - - CHARGES PATRONALES - - - -
- [[repeatIn(get_payslip_lines(o.line_ids),'p')]] - - - - [[ p.code or '' ]] - - - [[ p.name or '' ]] - - - [[ ((p.amount_select== 'percentage') or removeParentNode('para')) and '' ]] [[ p.amount or '' ]] - [[ ((p.amount_select== 'fix') or removeParentNode('para')) and '' ]] [[ p.quantity or '' ]] - [[ ((p.amount_select<> 'fix' and p.amount_select<> 'percentage') or removeParentNode('para')) and '' ]] - - - [[ ((p.amount_select == 'percentage') or removeParentNode('para')) and '' ]] [[ p.rate or '' ]] - [[ ((p.amount_select <> 'percentage') or removeParentNode('para')) and '' ]] - - - [[ p.total or '' ]] - - - [[ get_employer_line(o, p) and get_employer_line(o, p).rate or '']] - - - [[ get_employer_line(o,p) and get_employer_line(o,p).total or '' ]] - - - -
- - - - - - - - - - Mode de reglement : [[ o.payment_mode or '' ]] - Paye le : [[ formatLang(o.move_id.date, date=True) or '']] - - - NET A PAYER - - - TOTAL CHARGES PATRONALES - - - - - Conv. Coll.: [[ o.employee_id.company_id.conv_coll or '' ]] - - - [[ get_total_by_rule_category(o, 'NET') ]] - - - [[ get_total_by_rule_category(o, 'COMP') ]] - - - - - - - SALAIRE BRUT - - - TOTAL CHARGES SALARIALES - - - NET IMPOSABLE - - - PLAFOND S.S. - - - - - - - - COUT GLOBAL SALARIE - - - - - [[ get_total_by_rule_category(o, 'BRUT') ]] - - - [[ get_total_by_rule_category(o, 'SALC') ]] - - - [[ get_total_by_rule_category(o, 'C_IMP') ]] - - - [[ o.employee_id.company_id.plafond_secu or '' ]] - - - - - - - - [[ get_total_by_rule_category(o, 'TOTAL') ]] - - - - - - - - - - - DANS VOTRE INTERET ET POUR VOUS AIDER A FAIRE VALOIR VOS DROITS, CONSERVEZ CE BULLETIN DE PAIE SANS LIMITATION DE DUREE - -
-
- diff --git a/addons/l10n_fr_hr_payroll/views/report_l10nfrfichepaye.xml b/addons/l10n_fr_hr_payroll/views/report_l10nfrfichepaye.xml new file mode 100644 index 00000000000..8aa0d4e125d --- /dev/null +++ b/addons/l10n_fr_hr_payroll/views/report_l10nfrfichepaye.xml @@ -0,0 +1,147 @@ + + + + + +