Merge lp://staging/~mukunde/unifield-server/US-9730 into lp://staging/unifield-server
Proposed by
jftempo
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~mukunde/unifield-server/US-9730 |
| Merge into: | lp://staging/unifield-server |
| Diff against target: |
182 lines (+78/-4) (has conflicts) 2 files modified
bin/addons/msf_homere_interface/wizard/hr_payroll_import.py (+65/-4) bin/addons/msf_profile/i18n/fr_MF.po (+13/-0) Text conflict in bin/addons/msf_homere_interface/wizard/hr_payroll_import.py Text conflict in bin/addons/msf_profile/i18n/fr_MF.po |
| To merge this branch: | bzr merge lp://staging/~mukunde/unifield-server/US-9730 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| UniField Reviewer Team | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Unmerged revisions
- 6212. By Gaël Mukunde
-
US-9730 [IMP] Error message translation
- 6211. By Gaël Mukunde
-
US-9730 [IMP] Translation
- 6210. By Gaël Mukunde
-
US-9730 [IMP] More explict message to indicate that the blocking errors are from Employee AD
- 6209. By Gaël Mukunde
-
US-9730 [IMP] Use a boolean flag to indicate blocking errors during import and adapt warning message
- 6208. By Gaël Mukunde
-
US-9730 [IMP] Use data from SAGA files if available, otherwise retrieve from employee
- 6207. By Gaël Mukunde
-
US-9730 [IMP] Fix code for error messages collecting
- 6206. By Gaël Mukunde
-
US-9730 [IMP] List all AD errors in payroll import wizard
- 6205. By Gaël Mukunde
-
US-9730 [IMP] Regroup all AD errors at payroll import
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
