Two tickets

diff --git a/project/assets/css/dae.css b/project/assets/css/dae.css
index 14edde2..9e905cc 100644 (file)
--- a/project/assets/css/dae.css
+++ b/project/assets/css/dae.css
@@ -19,7 +19,7 @@ h2.section {width:100%; background-color: #D0E8F8; text-align: center; color: #5
 .pagination { text-align: center; }
 table.listing { width: 100%; }
 .print-only { display: none; }
-.total-row th { background-color: #C7D1D8; }
-table#global-cost tr td.spaced {
+.total-row th, .total-row td { background-color: #C7D1D8; }
+tr td.spaced {
     padding-left: 25px;
 }
\ No newline at end of file

diff --git a/project/dae/templates/dae/poste_resume.html b/project/dae/templates/dae/poste_resume.html
index 44e5ec7..2573967 100644 (file)
--- a/project/dae/templates/dae/poste_resume.html
+++ b/project/dae/templates/dae/poste_resume.html
@@ -92,7 +92,7 @@
       <td>{{ poste.classement_max }}</td>
     </tr>
     <tr>
-      <th>Salaire de base</th>
+      <td class="spaced" >Salaire de base</td>
       <td class="montant">
         {{ poste.salaire_min|floatformat:0 }} {{ poste.devise_min.code }}
       </td>
@@ -101,46 +101,46 @@
       </td>
     </tr>
     <tr>
-      <th>Indem. d'expatriation</th>
+      <td class="spaced">Indem. d'expatriation</td>
       <td class="montant">{{ poste.indemn_expat_min|floatformat:0 }} {{ poste.devise_min.code }}</td>
       <td class="montant">{{ poste.indemn_expat_max|floatformat:0 }} {{ poste.devise_max.code }}</td>
     </tr>
     <tr>
-      <th>Indem. de fonction</th>
+      <td class="spaced">Indem. de fonction</td>
       <td class="montant">{{ poste.indemn_fct_min|floatformat:0 }} {{ poste.devise_min.code }}</td>
       <td class="montant">{{ poste.indemn_fct_max|floatformat:0 }} {{ poste.devise_max.code }}</td>
     </tr>
     <tr>
-      <th>Charges patronales</th>
+      <td class="spaced">Charges patronales</td>
       <td class="montant">{{ poste.charges_patronales_min|floatformat:0 }} {{ poste.devise_min.code }}</td>
       <td class="montant">{{ poste.charges_patronales_max|floatformat:0 }} {{ poste.devise_max.code }}</td>
     </tr>
     <tr>
-      <th>Autres</th>
+      <td class="spaced">Autres</td>
       <td class="montant">{{ poste.autre_min|floatformat:0 }} {{ poste.devise_min.code }}</td>
       <td class="montant">{{ poste.autre_max|floatformat:0 }} {{ poste.devise_max.code }}</td>
     </tr>
-    <tr>
+    <tr class="total-row" >
       <th>TOTAL</th>
       <td class="montant">{{ poste.get_couts_minimum|floatformat:0 }} {{ poste.devise_min.code }}</td>
       <td class="montant">{{ poste.get_couts_maximum|floatformat:0 }} {{ poste.devise_max.code }}</td>
     </tr>
-    <tr>
+    <tr class="total-row" >
       <th>TOTAL sans charges patronales</th>
       <td class="montant">{{ poste.get_salaire_minimum|floatformat:0 }} {{ poste.devise_min.code }}</td>
       <td class="montant">{{ poste.get_salaire_maximum|floatformat:0 }} {{ poste.devise_max.code }}</td>
     </tr>
     <tr>
-      <th>Taux&nbsp;&gt;&nbsp;€</th>
+      <td class="spaced">Taux&nbsp;&gt;&nbsp;€</td>
       <td>{{ poste.show_taux_minimum }}</td>
       <td>{{ poste.show_taux_maximum }}</td>
     </tr>
-    <tr>
+    <tr class="total-row" >
       <th>TOTAL (EUR)</th>
       <td class="montant">{{ poste.show_couts_minimum_euros|floatformat:0 }} €</td>
       <td class="montant">{{ poste.show_couts_maximum_euros|floatformat:0 }} €</td>
     </tr>
-    <tr>
+    <tr class="total-row" >
       <th>TOTAL (EUR) sans charges patronales</th>
       <td class="montant">{{ poste.show_salaire_minimum_euros|floatformat:0 }} €</td>
       <td class="montant">{{ poste.show_salaire_maximum_euros|floatformat:0 }} €</td>

diff --git a/project/rh/admin.py b/project/rh/admin.py
index 561f00d..bafdf51 100644 (file)
--- a/project/rh/admin.py
+++ b/project/rh/admin.py
@@ -386,7 +386,7 @@ class DeviseAdmin(reversion.VersionAdmin, ArchivableAdmin,
                   DerniereModificationAdmin, BaseAdmin):
     ignore_duplicate_revisions = True
     list_display = (
-        'code', 'nom', '_archive', 'derniere_modification',
+        'code', 'nom', 'derniere_modification', '_archive',
     )
     list_filter = ('archive', )
     fieldsets = (
@@ -1140,7 +1140,7 @@ class ResponsableImplantationAdmin(BaseAdmin):
 
 
 class ServiceAdminBase(ArchivableAdmin, DerniereModificationAdmin, BaseAdmin):
-    list_display = ('nom', '_archive', 'derniere_modification')
+    list_display = ('nom', 'derniere_modification', '_archive')
     list_filter = ('archive', )
     fieldsets = (
         (None, {'fields': ('nom', 'archive')}),
@@ -1247,8 +1247,8 @@ class TypeRemunerationAdmin(reversion.VersionAdmin, ArchivableAdmin,
                             DerniereModificationAdmin, BaseAdmin):
     ignore_duplicate_revisions = True
     list_display = (
-        'nom', 'type_paiement', 'nature_remuneration', '_archive',
-        'derniere_modification'
+        'nom', 'type_paiement', 'nature_remuneration',
+        'derniere_modification', '_archive'
     )
     list_filter = ('archive', )
     fieldsets = (