fix #1412, #1552

diff --git a/project/dae/templates/dae/embauche-remun-consulter.html b/project/dae/templates/dae/embauche-remun-consulter.html
index f9d56c6..d7e2bbc 100644 (file)
--- a/project/dae/templates/dae/embauche-remun-consulter.html
+++ b/project/dae/templates/dae/embauche-remun-consulter.html
@@ -7,13 +7,6 @@
   <th>Précision</th>
 </tr>
 
   <th>Précision</th>
 </tr>
 

-<tr>
-    <th colspan="5">Salaire brut</th>
-    <th id="sous-total-cout" class="montant">{{ dossier.get_salaire_brut|floatformat:0 }}€</th>
-    <th></th>
-</tr>
-
-

 {% for remun in dossier.get_remunerations_brutes %}
   <tr class="cout">
     <td>{{ remun.type }}</td>
 {% for remun in dossier.get_remunerations_brutes %}
   <tr class="cout">
     <td>{{ remun.type }}</td>

@@ -27,11 +20,12 @@
 {% endfor %}
 
 <tr>
 {% endfor %}
 
 <tr>

-    <th colspan="5">Charges salariales</th>
-    <th id="sous-total-aide" class="montant">{{ dossier.get_total_charges_salariales|floatformat:0 }}€</th>
+    <th colspan="5">Salaire brut</th>
+    <th id="sous-total-cout" class="montant">{{ dossier.get_salaire_brut|floatformat:0 }}€</th>

     <th></th>
 </tr>
 
     <th></th>
 </tr>
 

+

 {% for remun in dossier.get_charges_salariales %}
   <tr class="aide">
     <td>{{ remun.type }}</td>
 {% for remun in dossier.get_charges_salariales %}
   <tr class="aide">
     <td>{{ remun.type }}</td>

@@ -45,8 +39,14 @@
 {% endfor %}
 
 <tr>
 {% endfor %}
 
 <tr>

-    <th colspan="5">Charges patronales</th>
-    <th id="sous-total-cout" class="montant">{{ dossier.get_total_charges_patronales|floatformat:0 }}€</th>
+    <th colspan="5">Charges salariales</th>
+    <th id="sous-total-aide" class="montant">{{ dossier.get_total_charges_salariales|floatformat:0 }}€</th>
+    <th></th>
+</tr>
+
+<tr>
+    <th colspan="5">Salaire net</th>
+    <th id="sous-total-aide" class="montant">{{ dossier.get_salaire_net|floatformat:0 }}€</th>

     <th></th>
 </tr>
 
     <th></th>
 </tr>
 

@@ -61,6 +61,12 @@
     <td>{{ remun.precision }}</td>
   </tr>
 {% endfor %}
     <td>{{ remun.precision }}</td>
   </tr>
 {% endfor %}

+<tr>
+    <th colspan="5">Charges patronales</th>
+    <th id="sous-total-cout" class="montant">{{ dossier.get_total_charges_patronales|floatformat:0 }}€</th>
+    <th></th>
+</tr>
+

 
 <tr>
     <th colspan="5">Côuts AUF</th>
 
 <tr>
     <th colspan="5">Côuts AUF</th>

diff --git a/project/dae/templates/dae/embauche_consulter.html b/project/dae/templates/dae/embauche_consulter.html
index 10bae49..509ee3f 100644 (file)
--- a/project/dae/templates/dae/embauche_consulter.html
+++ b/project/dae/templates/dae/embauche_consulter.html
@@ -138,7 +138,6 @@
   <table>
   <tr>
       <th>Action</th>
   <table>
   <tr>
       <th>Action</th>

-      <th>Destinataire de l'action</th>

       <th>Commentaire</th>
   </tr>
   {% for commentaire in dossier.historique_desc %}
       <th>Commentaire</th>
   </tr>
   {% for commentaire in dossier.historique_desc %}

diff --git a/project/dae/templates/dae/embauche_pdf.html b/project/dae/templates/dae/embauche_pdf.html
index 32354b7..b7faaf8 100644 (file)
--- a/project/dae/templates/dae/embauche_pdf.html
+++ b/project/dae/templates/dae/embauche_pdf.html
@@ -127,13 +127,17 @@
 </table>
 
 <fieldset>
 </table>
 
 <fieldset>

-<h2>Validation</h2>
+<h2>Validations</h2>

 
 

-<ul>
+<table>
+<tr>
+    <th>Action</th>
+    <th>Commentaire</th>
+</tr>

 {% for commentaire in dossier.historique_desc %}
 {% for commentaire in dossier.historique_desc %}

-    <li>{{ commentaire }}</li>
+  {% include "dae/ligne_validation.html" %}

 {% endfor %}
 {% endfor %}

-</ul>
+</table>

 </fieldset>
 
 <fieldset>
 </fieldset>
 
 <fieldset>

diff --git a/project/dae/templates/dae/ligne_validation.html b/project/dae/templates/dae/ligne_validation.html
index 65e457b..2dcc314 100644 (file)
--- a/project/dae/templates/dae/ligne_validation.html
+++ b/project/dae/templates/dae/ligne_validation.html
@@ -7,9 +7,6 @@
     {% endif %}
 </td>
 <td>
     {% endif %}
 </td>
 <td>

-    {{ commentaire.get_etat_final_label }}
-</td>
-<td>

     {% if commentaire.texte %} ({{ commentaire.texte }}){% endif %}
 </td>
 </tr>
     {% if commentaire.texte %} ({{ commentaire.texte }}){% endif %}
 </td>
 </tr>

diff --git a/project/dae/templates/dae/poste_consulter.html b/project/dae/templates/dae/poste_consulter.html
index b2a6e9f..1c6e8be 100644 (file)
--- a/project/dae/templates/dae/poste_consulter.html
+++ b/project/dae/templates/dae/poste_consulter.html
@@ -26,7 +26,6 @@ Demande d'autorisation d'embauche
 <table>
 <tr>
     <th>Action</th>
 <table>
 <tr>
     <th>Action</th>

-    <th>Destinataire de l'action</th>

     <th>Commentaire</th>
 </tr>
 {% for commentaire in poste.historique_desc %}
     <th>Commentaire</th>
 </tr>
 {% for commentaire in poste.historique_desc %}

diff --git a/project/dae/templates/dae/poste_pdf.html b/project/dae/templates/dae/poste_pdf.html
index 9da8f03..5290ab6 100644 (file)
--- a/project/dae/templates/dae/poste_pdf.html
+++ b/project/dae/templates/dae/poste_pdf.html
@@ -14,15 +14,19 @@
     <div class="visualClear"></div>
     
     {% include "dae/poste_resume.html" %}
     <div class="visualClear"></div>
     
     {% include "dae/poste_resume.html" %}

-    
+

     <fieldset>
     <fieldset>

-    <h2>Validation</h2>
+    <h2>Validations</h2>

     
     

-    <ul>
+    <table>
+    <tr>
+        <th>Action</th>
+        <th>Commentaire</th>
+    </tr>

     {% for commentaire in poste.historique_desc %}
     {% for commentaire in poste.historique_desc %}

-        <li>{{ commentaire }}</li>
+        {% include "dae/ligne_validation.html" %}

     {% endfor %}
     {% endfor %}

-    </ul>
+    </table>

     </fieldset>
 
     <fieldset>
     </fieldset>
 
     <fieldset>