Merge branch 'Fix_mr_190' into 'master'

Fix ticks

See merge request federez/re2o!202

cotisations/templates/cotisations/aff_article.html

@@ -29,6 +29,17 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 <table class="table table-striped">
     <thead>
+        <tr>
+            <th>{% trans "Article" %}</th>
+            <th>{% trans "Price" %}</th>
+            <th>{% trans "Cotisation type" %}</th>
+            <th>{% trans "Duration (month)" %}</th>
+            <th>{% trans "Concerned users" %}</th>
+            <th>{% trans "Available for everyone" | tick %}</th>
+            <th></th>
+        </tr>
+    </thead>
+    {% for article in article_list %}
     <tr>
         <td>{{ article.name }}</td>
         <td>{{ article.prix }}</td>
@@ -44,33 +55,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             {% acl_end %}
             {% history_button article %}
         </td>
-            <th>{% trans "Article" %}</th>
-            <th>{% trans "Price" %}</th>
-            <th>{% trans "Cotisation type" %}</th>
-            <th>{% trans "Duration (month)" %}</th>
-            <th>{% trans "Concerned users" %}</th>
-            <th>{% trans "Available for everyone" %}</th>
-            <th></th>
-        </tr>
-    </thead>
-    {% for article in article_list %}
-    <tr>
-        <td>{{ article.name }}</td>
-        <td>{{ article.prix }}</td>
-        <td>{{ article.type_cotisation }}</td>
-        <td>{{ article.duration }}</td>
-        <td>{{ article.type_user }}</td>
-        <td>{{ article.available_for_everyone|tick }}</td>
-        <td class="text-right">
-            {% can_edit article %}
-            <a class="btn btn-primary btn-sm" role="button" title="{% trans "Edit" %}" href="{% url 'cotisations:edit-article' article.id %}">
-                <i class="fa fa-edit"></i>
-            </a>
-            {% acl_end %}
-            <a class="btn btn-info btn-sm" role="button" title="{% trans "Historique" %}" href="{% url 'cotisations:history' 'article' article.id %}">
-                <i class="fa fa-history"></i>
-            </a>
-        </td>
     </tr>
     {% endfor %}
 </table>

cotisations/templates/cotisations/aff_paiement.html

@@ -30,19 +30,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 <table class="table table-striped">
     <thead>
         <tr>
-            <td>{{ paiement.moyen }}</td>
-            <td>{{ paiement.available_for_everyone }}</td>
-            <td>
-                {{paiement.get_payment_method_name}}
-            </td>
-            <td class="text-right">
-                {% can_edit paiement %}
-                <a class="btn btn-primary btn-sm" role="button" title="{% trans "Edit" %}" href="{% url 'cotisations:edit-paiement' paiement.id %}">
-                    <i class="fa fa-edit"></i>
-                </a>
-                {% acl_end %}
-                {% history_button paiement %}
-            </td>
             <th>{% trans "Payment type" %}</th>
             <th>{% trans "Is available for everyone" %}</th>
             <th>{% trans "Custom payment method" %}</th>
@@ -62,9 +49,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                 <i class="fa fa-edit"></i>
             </a>
             {% acl_end %}
-            <a class="btn btn-info btn-sm" role="button" title="{% trans "Historique" %}" href="{% url 'cotisations:history' 'paiement' paiement.id %}">
+            {% history_button paiement %}
-                <i class="fa fa-history"></i>
-            </a>
         </td>
     </tr>
     {% endfor %}

machines/templates/machines/aff_extension.html

@@ -54,7 +54,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                 {% include 'buttons/edit.html' with href='machines:edit-extension' id=extension.id %}
                 {% acl_end %}
                 {% history_button extension %}
-                {% include 'buttons/history.html' with href='machines:history' name='extension' id=extension.id %}
             </td>
         </tr>
         {% endfor %}

machines/templates/machines/aff_iptype.html

@@ -55,7 +55,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                 {% include 'buttons/edit.html' with href='machines:edit-iptype' id=type.id %}
                 {% acl_end %}
                 {% history_button type %}
-                {% include 'buttons/history.html' with href='machines:history' name='iptype' id=type.id %}
             </td>
         </tr>
         {% endfor %}

machines/templates/machines/aff_nas.html

@@ -49,7 +49,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             {% include 'buttons/edit.html' with href='machines:edit-nas' id=nas.id %}
             {% acl_end %}
             {% history_button nas %}
-            {% include 'buttons/history.html' with href='machines:history' name='nas' id=nas.id %}
         </td>
     </tr>
     {% endfor %}

machines/templates/machines/aff_service.html

@@ -47,7 +47,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             {% include 'buttons/edit.html' with href='machines:edit-service' id=service.id %}
             {% acl_end %}
             {% history_button service %}
-            {% include 'buttons/history.html' with href='machines:history' name='service' id=service.id %}
         </td>
     </tr>
     {% endfor %}