Some small post-merge fixes.

copanier/__init__.py

@@ -373,14 +373,19 @@ async def list_producers(request, response, id):
     delivery = Delivery.load(id)
     template_name = "list_products.html"
     template_params = {
-            "edit_mode": True,
+        "edit_mode": True,
-            "list_only": True,
+        "list_only": True,
-            "delivery": delivery,
+        "delivery": delivery,
-            "referent": request.query.get("referent", None),
+        "referent": request.query.get("referent", None),
-    },
+    }
 
     if request.url.endswith(b".pdf"):
-        response.pdf(template_name, template_params, filename=utils.prefix("producteurices.pdf", delivery),)
+        template_params["edit_mode"] = False
+        response.pdf(
+            template_name,
+            template_params,
+            filename=utils.prefix("producteurices.pdf", delivery),
+        )
     else:
         response.html(template_name, template_params)
 
@@ -662,25 +667,6 @@ async def place_order(request, response, id):
         )
 
 
-@app.route("/livraison/{id}/courriel", methods=["GET"])
-async def send_order(request, response, id):
-    delivery = Delivery.load(id)
-    email = request.query.get("email")
-    order = delivery.orders.get(email)
-    if not order:
-        response.message(f"Aucune commande pour «{email}»", status="warning")
-    else:
-        try:
-            emails.send_order(
-                request, env, person=Person(email=email), delivery=delivery, order=order
-            )
-        except RuntimeError:
-            response.message("Oops, impossible d'envoyer le courriel…", status="error")
-        else:
-            response.message(f"Résumé de commande envoyé à «{email}»")
-    response.redirect = f"/livraison/{delivery.id}"
-
-
 @app.route("/livraison/{id}/émargement", methods=["GET"])
 async def signing_sheet(request, response, id):
     delivery = Delivery.load(id)
@@ -736,16 +722,6 @@ async def import_multiple_commands(request, response, id):
     response.redirect = f"/livraison/{delivery.id}"
 
 
-@app.route("/livraison/{id}/bon-de-commande.xlsx", methods=["GET"])
-async def xls_report(request, response, id):
-    delivery = Delivery.load(id)
-    date = delivery.to_date.strftime("%Y-%m-%d")
-    response.xlsx(
-        reports.summary(delivery),
-        filename=f"{config.SITE_NAME}-{date}-bon-de-commande.xlsx",
-    )
-
-
 @app.route("/livraison/{id}/rapport-complet.xlsx", methods=["GET"])
 async def xls_full_report(request, response, id):
     delivery = Delivery.load(id)
@@ -845,12 +821,6 @@ async def delivery_balance(request, response, id):
         response.html(template_name, template_args)
 
 
-@app.route("/livraison/{id}/solde.xlsx", methods=["GET"])
-async def delivery_balance_report(request, response, id):
-    delivery = Delivery.load(id)
-    response.xlsx(reports.balance(delivery))
-
-
 def configure():
     config.init()
 

copanier/templates/delivery.html

@@ -32,21 +32,23 @@
 <ul class="toolbox">
     {% if not delivery.is_archived and delivery.status == delivery.CLOSED %}
     <li>
-        <a href="/livraison/{{ delivery.iddelivery }}/bon-de-commande.xlsx"><i class="icon-ribbon"></i> Bon de commande</a>
+        <a href="/livraison/{{ delivery.id }}/producteurices.pdf"><i class="icon-ribbon"></i> Bon de commande</a>
     </li>
     <li>
         <a href="/livraison/{{ delivery.id }}/rapport-complet.xlsx"><i class="icon-grid"></i> Rapport complet</a>
     </li>
     <li>
-        <a href="/livraison/{{ delivery.id }}/émargement" target="_blank"><i class="icon-document"></i> Liste d'émargement</a>
+        <a href="/livraison/{{ delivery.id }}/émargement" target="_blank"><i class="icon-document"></i> Résumé de commandes</a>
     </li>
     {% endif %}
     {% if request.user and request.user.is_staff %}
+    {% if delivery.is_archived %}
     <li>
         <a href="/livraison/{{ delivery.id }}/désarchiver" class="button danger"><i class="icon-hazardous"></i>&nbsp;Désarchiver</a>
     </li>
+    {% endif %}
     <li>
-        <a href="/livraison/{{ delivery.id }}/exporter"><i class="icon-layers"></i> Liste des produits</a>
+        <a href="/livraison/{{ delivery.id }}/exporter"><i class="icon-layers"></i> Télécharger les infos produits</a>
     </li>
     <li>
         <a href="/livraison/{{ delivery.id }}/edit"><i class="icon-adjustments"></i> Modifier la livraison</a>

copanier/templates/includes/order_summary.html

@@ -3,7 +3,6 @@
     {% for product in delivery.products %}
     {% if order[product].quantity %}
     <tr>
-        <td>{{ product.ref }}</td>
         <th class="product" style="text-align: left;">{{ product }}</th>
         {% if display_prices %}<td>{{ product.price | round(2) }} €</td>{% endif %}<td>{{ order[product].quantity }} x {{ product.unit }}</td>
     </tr>

copanier/templates/place_order.html

@@ -17,7 +17,7 @@
                 <th class="packing">Conditionnement</th>
             {% endif %}
             <th class="amount">Commande</th>
-            {% if delivery.status == delivery.ADJUSTMENT or order.has_adjustments or force_adjustment %}
+            {% if delivery.status == delivery.ADJUSTMENT or force_adjustment %}
                 <th class="amount">Ajustement +/−</th>
             {% endif %}
         </tr>
@@ -36,10 +36,10 @@
             {% if delivery.has_packing %}
                 <td {% if delivery.status == delivery.ADJUSTMENT and delivery.product_missing(product) %} class="missing" title="Les commandes individuelles ne correspondent pas aux conditionnements"{% endif %}>{{ product.packing or "—" }}{% if delivery.status == delivery.ADJUSTMENT and delivery.product_missing(product) %} (manque {{ delivery.product_missing(product) }}){% endif %}</td>
             {% endif %}
-            {% if delivery.status == delivery.ADJUSTMENT or order.has_adjustments or force_adjustments %}
+            <td class="with-input"><input {% if not request.user.is_referent(delivery) and delivery.status != delivery.OPEN or product.rupture %}type="text" readonly{% else%}type="number"{% endif%} min=0 name="wanted:{{ product.ref }}" value="{{ order[product].wanted }}">{% if not (delivery.status == delivery.ADJUSTMENT or force_adjustments) %} x {{ product.unit }}{% endif %}</td>
-            <td class="with-input"><input type="number" name="adjustment:{{ product.ref }}" value="{{ order[product].adjustment }}" min="{{ order[product].wanted * -1 }}" {% if not (delivery.product_missing(product) or force_adjustment) %}readonly{% endif %}></td>
+            {% if delivery.status == delivery.ADJUSTMENT or force_adjustments %}
+            <td class="with-input"><input type="number" name="adjustment:{{ product.ref }}" value="{{ order[product].adjustment }}" min="{{ order[product].wanted * -1 }}" {% if not (delivery.product_missing(product) or force_adjustment) %}readonly{% endif %}> x {{ product.unit }}</td>
             {% endif %}
-            <td class="with-input"><input {% if not request.user.is_referent(delivery) and delivery.status != delivery.OPEN or product.rupture %}type="text" readonly{% else%}type="number"{% endif%} min=0 name="wanted:{{ product.ref }}" value="{{ order[product].wanted }}"> x {{ product.unit }}</td>
         </tr>
         {% endfor %}
         </tbody>
@@ -53,7 +53,6 @@
     {% if delivery.status != delivery.CLOSED or request.user.is_staff %}
     <input type="submit" value="Enregistrer la commande" class="primary">
     {% endif %}
-    <a class="button" href="/livraison/{{ delivery.id }}/courriel?email={{ person.email }}">Envoyer par courriel</a>
     {% if request.user.is_staff and delivery.status == delivery.CLOSED %}
     <a class="button danger" href="/livraison/{{ delivery.id }}/commander?email={{ person.email }}&adjust">Ajuster</a>
     {% endif %}