Browse Source

Re-order: put costs before provisioning

In service detail
Jocelyn Delande 9 years ago
parent
commit
5c2e2ce9dc
1 changed files with 14 additions and 14 deletions
  1. 14 14
      costs/templates/costs/service_detail.html

+ 14 - 14
costs/templates/costs/service_detail.html

@@ -118,33 +118,33 @@ chantiers, et parer aux imprévus. Bien qu'elle n'apparaisse pas ici, il est
       </tr>
     </thead>
     <tbody>
-  {% for usage in goods_uses %}
+  {% for usage in costs_uses %}
       <tr>
       {% if forloop.first %}
-        <td rowspan="{{ goods_uses|length }}">Amortissement</td>
+        <td rowspan="{{ costs_uses|length }}">Récurrent</td>
       {% endif %}
         <td>
-       {{ usage.resource.name }}
+      {{ usage.resource.name }}
           <span class="bare-info">
-       {% if usage.resource.capacity_unit %}
+               {% if usage.resource.capacity_unit %}
            ({{ usage.unit_share|human_round }} {{ usage.resource.get_capacity_unit_display }})
          {% else %}
            ({{ usage.unit_real_share|percent }})
          {% endif %}
           </span>
         </td>
-        <td class="right aligned">{{ usage.unit_monthly_provision_share|price }}</td>
+        <td class="right aligned">{{ usage.unit_cost_share|price }}</td>
       </tr>
   {% endfor %}
-  {% for usage in costs_uses %}
+  {% for usage in services_uses %}
       <tr>
       {% if forloop.first %}
-        <td rowspan="{{ costs_uses|length }}">Récurrent</td>
+        <td rowspan="{{ costs_uses|length }}">Récurrent (service)</td>
       {% endif %}
         <td>
-      {{ usage.resource.name }}
+          <a href="{{ usage.resource.get_absolute_url }}">service {{ usage.resource.name }}</a>
           <span class="bare-info">
-               {% if usage.resource.capacity_unit %}
+         {% if usage.resource.capacity_unit %}
            ({{ usage.unit_share|human_round }} {{ usage.resource.get_capacity_unit_display }})
          {% else %}
            ({{ usage.unit_real_share|percent }})
@@ -154,22 +154,22 @@ chantiers, et parer aux imprévus. Bien qu'elle n'apparaisse pas ici, il est
         <td class="right aligned">{{ usage.unit_cost_share|price }}</td>
       </tr>
   {% endfor %}
-  {% for usage in services_uses %}
+  {% for usage in goods_uses %}
       <tr>
       {% if forloop.first %}
-        <td rowspan="{{ costs_uses|length }}">Récurrent (service)</td>
+        <td rowspan="{{ goods_uses|length }}">Amortissement</td>
       {% endif %}
         <td>
-          <a href="{{ usage.resource.get_absolute_url }}">service {{ usage.resource.name }}</a>
+       {{ usage.resource.name }}
           <span class="bare-info">
-         {% if usage.resource.capacity_unit %}
+       {% if usage.resource.capacity_unit %}
            ({{ usage.unit_share|human_round }} {{ usage.resource.get_capacity_unit_display }})
          {% else %}
            ({{ usage.unit_real_share|percent }})
          {% endif %}
           </span>
         </td>
-        <td class="right aligned">{{ usage.unit_cost_share|price }}</td>
+        <td class="right aligned">{{ usage.unit_monthly_provision_share|price }}</td>
       </tr>
   {% endfor %}
     </tbody>