From dcc19bd9e8a555fc077b6ec7dea80181e1f8d3b9 Mon Sep 17 00:00:00 2001
From: Qwann <narmanli@clipper.ens.fr>
Date: Mon, 6 Mar 2017 01:58:33 +0100
Subject: [PATCH 1/2] article.hidden in article & article_read

---
 kfet/templates/kfet/article.html      | 4 +++-
 kfet/templates/kfet/article_read.html | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/kfet/templates/kfet/article.html b/kfet/templates/kfet/article.html
index 1d0a86fd..20d3ed50 100644
--- a/kfet/templates/kfet/article.html
+++ b/kfet/templates/kfet/article.html
@@ -33,6 +33,7 @@
                 <td class="text-right">Prix</td>
                 <td class="text-right">Stock</td>
                 <td class="text-right">En vente</td>
+                <td class="text-right">Affiché</td>
                 <td class="text-right">Dernier inventaire</td>
               </tr>
             </thead>
@@ -40,7 +41,7 @@
               {% for article in articles %}
                 {% ifchanged article.category %}
                   <tr class="section">
-                    <td colspan="6">{{ article.category.name }}</td>
+                    <td colspan="7">{{ article.category.name }}</td>
                   </tr>
                 {% endifchanged %}
                 <tr>
@@ -53,6 +54,7 @@
                   <td class="text-right">{{ article.price }}€</td>
                   <td class="text-right">{{ article.stock }}</td>
                   <td class="text-right">{{ article.is_sold }}</td>
+                  <td class="text-right">{{ article.hidden | yesno:"Caché,Affiché" }}</td>
                   <td class="text-right">{{ article.inventory.0.at }}</td>
                 </tr>
               {% endfor %}
diff --git a/kfet/templates/kfet/article_read.html b/kfet/templates/kfet/article_read.html
index 89a13cba..59481f26 100644
--- a/kfet/templates/kfet/article_read.html
+++ b/kfet/templates/kfet/article_read.html
@@ -16,6 +16,7 @@
           <div class="line">Prix (hors réduc.): {{ article.price }}€</div>
           <div class="line">Stock: {{ article.stock }}</div>
           <div class="line">En vente: {{ article.is_sold }}</div>
+          <div class="line">Affiché : {{ article.hidden | yesno:"Non,Oui" }}</div>
         </div>
       </div>
       <div class="buttons">

From ca17e36b5ae2b1b516ae638588a44e4eb3aa1f6a Mon Sep 17 00:00:00 2001
From: Qwann <narmanli@clipper.ens.fr>
Date: Mon, 6 Mar 2017 02:03:19 +0100
Subject: [PATCH 2/2] clean display for is_sold

---
 kfet/templates/kfet/article.html      | 2 +-
 kfet/templates/kfet/article_read.html | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kfet/templates/kfet/article.html b/kfet/templates/kfet/article.html
index 20d3ed50..17c831df 100644
--- a/kfet/templates/kfet/article.html
+++ b/kfet/templates/kfet/article.html
@@ -53,7 +53,7 @@
                   <td>{{ article.name }}</td>
                   <td class="text-right">{{ article.price }}€</td>
                   <td class="text-right">{{ article.stock }}</td>
-                  <td class="text-right">{{ article.is_sold }}</td>
+                  <td class="text-right">{{ article.is_sold | yesno:"En vente,Non vendu"}}</td>
                   <td class="text-right">{{ article.hidden | yesno:"Caché,Affiché" }}</td>
                   <td class="text-right">{{ article.inventory.0.at }}</td>
                 </tr>
diff --git a/kfet/templates/kfet/article_read.html b/kfet/templates/kfet/article_read.html
index 59481f26..d4219128 100644
--- a/kfet/templates/kfet/article_read.html
+++ b/kfet/templates/kfet/article_read.html
@@ -15,8 +15,8 @@
         <div class="block">
           <div class="line">Prix (hors réduc.): {{ article.price }}€</div>
           <div class="line">Stock: {{ article.stock }}</div>
-          <div class="line">En vente: {{ article.is_sold }}</div>
-          <div class="line">Affiché : {{ article.hidden | yesno:"Non,Oui" }}</div>
+          <div class="line">En vente: {{ article.is_sold | yesno:"Oui,Non" }}</div>
+          <div class="line">Affiché: {{ article.hidden | yesno:"Non,Oui" }}</div>
         </div>
       </div>
       <div class="buttons">