projets
/
auf_rh_dae.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
f52a617
)
5834
author
Benoit C. Sirois
<benoit.clennett-sirois@auf.org>
Thu, 11 Apr 2013 19:30:43 +0000
(15:30 -0400)
committer
Benoit C. Sirois
<benoit.clennett-sirois@auf.org>
Thu, 11 Apr 2013 19:30:43 +0000
(15:30 -0400)
project/dae/templates/dae/embauche-dossier-consulter.html
patch
|
blob
|
blame
|
history
project/dae/templates/dae/embauche_consulter.html
patch
|
blob
|
blame
|
history
project/dae/templates/dae/poste_resume.html
patch
|
blob
|
blame
|
history
diff --git
a/project/dae/templates/dae/embauche-dossier-consulter.html
b/project/dae/templates/dae/embauche-dossier-consulter.html
index
709e355
..
bf4caa3
100644
(file)
--- a/
project/dae/templates/dae/embauche-dossier-consulter.html
+++ b/
project/dae/templates/dae/embauche-dossier-consulter.html
@@
-74,7
+74,7
@@
{% if ancien_dossier and ancien_dossier.remunerations.all.count > 0 %}
<tr>
<td colspan="1">
{% if ancien_dossier and ancien_dossier.remunerations.all.count > 0 %}
<tr>
<td colspan="1">
- Rémunérations
+ Rémunération
</td>
<td colspan="6">
{% rh_remun_form_for_year ancien_dossier %}
</td>
<td colspan="6">
{% rh_remun_form_for_year ancien_dossier %}
@@
-116,7
+116,7
@@
{% if precedent_titulaire and precedent_titulaire.remunerations.all.count > 0 %}
<tr>
<td colspan="1">
{% if precedent_titulaire and precedent_titulaire.remunerations.all.count > 0 %}
<tr>
<td colspan="1">
- Rémunérations
+ Rémunération
</td>
<td colspan="6">
{% rh_remun_form_for_year precedent_titulaire %}
</td>
<td colspan="6">
{% rh_remun_form_for_year precedent_titulaire %}
diff --git
a/project/dae/templates/dae/embauche_consulter.html
b/project/dae/templates/dae/embauche_consulter.html
index
ba43f6d
..
185a2a3
100644
(file)
--- a/
project/dae/templates/dae/embauche_consulter.html
+++ b/
project/dae/templates/dae/embauche_consulter.html
@@
-93,7
+93,7
@@
{% if dc.dossier_comparaison_remunerations.count > 0 %}
<tr>
<td colspan="1">
{% if dc.dossier_comparaison_remunerations.count > 0 %}
<tr>
<td colspan="1">
- Rémunérations
+ Rémunération
</td>
<td colspan="6">
{% dossier_cmp_remun_form dc %}
</td>
<td colspan="6">
{% dossier_cmp_remun_form dc %}
diff --git
a/project/dae/templates/dae/poste_resume.html
b/project/dae/templates/dae/poste_resume.html
index
c38ad9a
..
76b7252
100644
(file)
--- a/
project/dae/templates/dae/poste_resume.html
+++ b/
project/dae/templates/dae/poste_resume.html
@@
-332,7
+332,7
@@
{% if poste_connexe.poste_comparaison_remunerations.count > 0 %}
<tr>
<td colspan="1">
{% if poste_connexe.poste_comparaison_remunerations.count > 0 %}
<tr>
<td colspan="1">
- Rémunérations
+ Rémunération
</td>
<td colspan="6">
{% poste_cmp_remun_form poste_connexe %}
</td>
<td colspan="6">
{% poste_cmp_remun_form poste_connexe %}