DGNum/gestioCOF
13
2
Fork 1
Code Issues 77 Pull requests 14 Packages Projects Releases 12 Wiki Activity

Merge branch 'qwann/k-fet/home' into qwann/k-fet/kfet_open

Browse source
This commit is contained in:
Qwann 2017-03-06 02:04:11 +01:00
parent 624707570e ca17e36b5a
commit 964dd716c6
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
kfet/templates/kfet/article.html
View file

@ -33,6 +33,7 @@
<td class="text-right">Prix</td> <td class="text-right">Prix</td>
<td class="text-right">Stock</td> <td class="text-right">Stock</td>
<td class="text-right">En vente</td> <td class="text-right">En vente</td>
<td class="text-right">Affiché</td>
<td class="text-right">Dernier inventaire</td> <td class="text-right">Dernier inventaire</td>
</tr> </tr>
</thead> </thead>
@ -40,7 +41,7 @@
{% for article in articles %} {% for article in articles %}
{% ifchanged article.category %} {% ifchanged article.category %}
<tr class="section"> <tr class="section">
<td colspan="6">{{ article.category.name }}</td> <td colspan="7">{{ article.category.name }}</td>
</tr> </tr>
{% endifchanged %} {% endifchanged %}
<tr> <tr>
@ -52,7 +53,8 @@
<td>{{ article.name }}</td> <td>{{ article.name }}</td>
<td class="text-right">{{ article.price }}€</td> <td class="text-right">{{ article.price }}€</td>
<td class="text-right">{{ article.stock }}</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> <td class="text-right">{{ article.inventory.0.at }}</td>
</tr> </tr>
{% endfor %} {% endfor %}

3
kfet/templates/kfet/article_read.html
View file

@ -15,7 +15,8 @@
<div class="block"> <div class="block">
<div class="line">Prix (hors réduc.): {{ article.price }}€</div> <div class="line">Prix (hors réduc.): {{ article.price }}€</div>
<div class="line">Stock: {{ article.stock }}</div> <div class="line">Stock: {{ article.stock }}</div>
<div class="line">En vente: {{ article.is_sold }}</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> </div>
<div class="buttons"> <div class="buttons">