diff --git a/copanier/templates/delivery.html b/copanier/templates/delivery.html
index 89d8b4d..46d4b1e 100644
--- a/copanier/templates/delivery.html
+++ b/copanier/templates/delivery.html
@@ -5,7 +5,7 @@
 {% include "includes/delivery_head.html" %}
 <article class="delivery">
 {% if delivery.has_products %}
-    {% include "includes/delivery_list.html" %}
+    {% include "includes/delivery_table.html" %}
 {% else %}
 <p>Aucun produit n'est encore défini pour cette livraison.</p>
 {% if request.user and request.user.is_staff %}
diff --git a/copanier/templates/includes/delivery_table.html b/copanier/templates/includes/delivery_table.html
new file mode 100644
index 0000000..547b43e
--- /dev/null
+++ b/copanier/templates/includes/delivery_table.html
@@ -0,0 +1,54 @@
+{% for producer in delivery.producers %}
+    <h2>{{ producer }}</h2>
+<table class="delivery">
+    <thead>
+        <tr>
+            <th class="product">Produit</th>
+            <th class="price">Prix</th>
+            {% if delivery.has_packing %}
+                <th class="packing">Conditionnement</th>
+            {% endif %}
+            <th class="amount">Total</th>
+            {% for email, order in delivery.orders.items() %}
+                <th class="person{% if delivery.is_passed and not order.paid %} not-paid{% endif %}">
+                    {% if request.user and request.user.is_staff %}
+                        <a href="/livraison/{{ delivery.id }}/commander?email={{ email }}" title="{{ email }}">{{ email }}</a>
+                    {% else %}
+                        <span title="{{ email }}">{{ email }}</span>
+                    {% endif %}
+                </th>
+            {% endfor %}
+        </tr>
+    </thead>
+    <tbody>
+        {% for product in delivery.get_products_by(producer) %}
+        <tr>
+            <th class="product">{{ product }}</th>
+            <td>{{ product.price | round(2) }} €</td>
+            {% if delivery.has_packing %}
+                <td class="packing">{{ product.packing or '—'}}</td>
+            {% endif %}
+            <th{% if delivery.status == delivery.ADJUSTMENT and delivery.product_missing(product) %} class="missing" title="Les commandes individuelles ne correspondent pas aux conditionnements"{% endif %}>
+                {{ delivery.product_wanted(product) }}
+                {% if delivery.status == delivery.ADJUSTMENT and delivery.product_missing(product) %} (−{{ delivery.product_missing(product) }})
+                {% if request.user.is_staff %}<a href="/livraison/{{ delivery.id }}/ajuster/{{ product.ref }}" class="button" title="ajuster le produit">ajuster</a>{% endif %}
+                {% endif %}
+            </th>
+            {% for email, order in delivery.orders.items() %}
+                <td title="Commandé: {{ order[product.ref].wanted }} — Ajusté: {{ "%+d"|format(order[product.ref].adjustment) }}">{{ order[product.ref].quantity or "—" }}</td>
+            {% endfor %}
+        </tr>
+        {% endfor %}
+        <tr>
+            <th class="total"><i class="icon-pricetags"></i> Total</th><td>—</td>
+            {% if delivery.has_packing %}
+                <td>—</td>
+            {% endif %}
+            <th class="total">{{ delivery.total_for_producer(producer) }} €</th>
+            {% for email, order in delivery.orders.items() %}
+            <td>{{ order.total(delivery.get_products_by(producer)) }} €</td>
+            {% endfor %}
+        </tr>
+    </tbody>
+</table>
+{% endfor %}
\ No newline at end of file