Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alain Takoudjou
erp5
Commits
1207126a
Commit
1207126a
authored
Jan 26, 2016
by
Nicolas Wavrant
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_payroll(.*): fix the case when an employee works for different firms
parent
6cea5e76
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
4 deletions
+15
-4
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateOvertimeHours.xml
...ayroll/PaySheetTransaction_getYearToDateOvertimeHours.xml
+1
-0
bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getOtherInformationsDataDict.xml
...n_fr/PaySheetTransaction_getOtherInformationsDataDict.xml
+12
-4
bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getYearToDateMovementTotalPriceFromCategory.xml
...ansaction_getYearToDateMovementTotalPriceFromCategory.xml
+1
-0
bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getYearToDateSlice.xml
...ayroll_l10n_fr/PaySheetTransaction_getYearToDateSlice.xml
+1
-0
No files found.
bt5/erp5_payroll/SkinTemplateItem/portal_skins/erp5_payroll/PaySheetTransaction_getYearToDateOvertimeHours.xml
View file @
1207126a
...
...
@@ -61,6 +61,7 @@ search_params = \\\n
\'portal_type\' : \'Pay Sheet Transaction\',\n
\'delivery.start_date\' : {\'range\': "minmax", \'query\': (from_date, to_date)},\n
\'delivery.source_section_uid\' : context.getSourceSectionUid(),\n
\'delivery.destination_section_uid\' : context.getDestinationSectionUid(),\n
\'simulation_state\' : [\'confirmed\', \'stopped\', \'delivered\'],\n
}\n
\n
...
...
bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getOtherInformationsDataDict.xml
View file @
1207126a
...
...
@@ -223,16 +223,24 @@ def unicodeDict(d):\n
return d\n
\n
source_section = paysheet.getSourceSectionValue()\n
career_args = {\'portal_type\': \'Career\',\n
\'parent_uid\': source_section.getUid(),\n
\'subordination_uid\': paysheet.getDestinationSectionUid(),\n
\'validation_state\': \'open\'}\n
source_section_career_results = portal.portal_catalog(**career_args)\n
\n
source_section_career = (source_section_career_results[0].getObject()\n
if len(source_section_career_results)\n
else source_section.getDefaultCareerValue() or \'\')\n
\n
data_dict = {\n
\'source_section_title\': source_section.getProperty(\'corporate_name\') or\\\n
source_section.getTitle(),\n
\'source_section_career_title\': getCareerId(paysheet.getSourceSectionValue() is not None\\\n
and source_section.getProperty(\'default_career_title\') or \'\'),\n
\'source_section_career_title\': getCareerId(source_section_career.getTitle()),\n
\'source_section_default_career_start_date\': getHiringDateId(paysheet.getSourceSectionValue() is not None\\\n
and getOrderedDate(source_section
.getProperty(\'default_career_start_date\'
)) or \'\'),\n
and getOrderedDate(source_section
_career.getStartDate(
)) or \'\'),\n
\'source_section_default_career_stop_date\': paysheet.getSourceSectionValue() is not None\\\n
and getOrderedDate(source_section
.getProperty(\'default_career_stop_date\'
)) or \'\',\n
and getOrderedDate(source_section
_career.getStopDate(
)) or \'\',\n
\'source_section_default_career_coefficient\' : getCareerCoefficientId(paysheet.getSourceSectionValue() is not None\\\n
and source_section.getProperty(\'career_salary_coefficient\') or \'\'),\n
\'source_section_default_career_salary_level\' : getSalaryLevelId(paysheet.getSourceSectionValue() is not None\\\n
...
...
bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getYearToDateMovementTotalPriceFromCategory.xml
View file @
1207126a
...
...
@@ -67,6 +67,7 @@ search_params = {\n
\'portal_type\' : \'Pay Sheet Transaction\',\n
\'delivery.start_date\' : {\'range\': "minmax", \'query\': (from_date, to_date)},\n
\'delivery.source_section_uid\' : context.getSourceSectionUid(),\n
\'delivery.destination_section_uid\' : context.getDestinationSectionUid(),\n
\'simulation_state\' : [\'confirmed\', \'stopped\', \'delivered\']\n
}\n
\n
...
...
bt5/erp5_payroll_l10n_fr/SkinTemplateItem/portal_skins/erp5_payroll_l10n_fr/PaySheetTransaction_getYearToDateSlice.xml
View file @
1207126a
...
...
@@ -64,6 +64,7 @@ search_params = {\n
\'portal_type\' : \'Pay Sheet Transaction\',\n
\'delivery.start_date\' : {\'range\': "minmax", \'query\': (from_date, to_date)},\n
\'delivery.source_section_uid\' : context.getSourceSectionUid(),\n
\'delivery.destination_section_uid\' : context.getDestinationSectionUid(),\n
\'simulation_state\' : [\'stopped\', \'delivered\'],\n
}\n
\n
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment