From 3b69557053ec71dd3aa8570ba1e6d4da164f676b Mon Sep 17 00:00:00 2001 From: Nicolas Wavrant <nicolas.wavrant@nexedi.com> Date: Wed, 6 Jun 2018 15:05:40 +0000 Subject: [PATCH] erp5_payroll: there now exist more than one type of payroll record --- ...etPayrollEnrollmentRecord.py => Person_getCareerRecord.py} | 4 ++-- ...PayrollEnrollmentRecord.xml => Person_getCareerRecord.xml} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/{Person_getPayrollEnrollmentRecord.py => Person_getCareerRecord.py} (86%) rename bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/{Person_getPayrollEnrollmentRecord.xml => Person_getCareerRecord.xml} (93%) diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/Person_getPayrollEnrollmentRecord.py b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/Person_getCareerRecord.py similarity index 86% rename from bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/Person_getPayrollEnrollmentRecord.py rename to bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/Person_getCareerRecord.py index 089d75b1dd..aa32c28aad 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/Person_getPayrollEnrollmentRecord.py +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/Person_getCareerRecord.py @@ -26,8 +26,8 @@ else: # and Organisation is taken into account career_step = career_step_list[0] -record = career_step.getAggregateValue() +record = career_step.getAggregateValue(portal_type=portal_type) if record is None: - raise AttributeError("No Payroll Enrollment Record found for employee %s" % context.getRelativeUrl()) + raise AttributeError("No %s found for employee %s" % (portal_type, context.getRelativeUrl())) return record diff --git a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/Person_getPayrollEnrollmentRecord.xml b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/Person_getCareerRecord.xml similarity index 93% rename from bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/Person_getPayrollEnrollmentRecord.xml rename to bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/Person_getCareerRecord.xml index a8815a1dcc..c8d07af2d0 100644 --- a/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/Person_getPayrollEnrollmentRecord.xml +++ b/bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/Person_getCareerRecord.xml @@ -50,11 +50,11 @@ </item> <item> <key> <string>_params</string> </key> - <value> <string>organisation=None</string> </value> + <value> <string>portal_type, organisation=None</string> </value> </item> <item> <key> <string>id</string> </key> - <value> <string>Person_getPayrollEnrollmentRecord</string> </value> + <value> <string>Person_getCareerRecord</string> </value> </item> </dictionary> </pickle> -- 2.30.9