Merge branch 'aide_a_la_commande' into dev_cooperatic

orders/static/css/oders_helper_style.css

@@ -2,7 +2,7 @@
     position: relative;
 }
 
-.page_content {
+.page_content, .login_area {
     position: absolute;
     top: 0;
     left: 0;
@@ -154,6 +154,10 @@
     cursor: pointer;
 }
 
+.product_not_from_supplier:hover {
+    background-color: #c7cace;
+}
+
 .product_name, .supplier_name, .product_npa {
     font-weight: bold;
 }

products/models.py

@@ -148,7 +148,8 @@ class CagetteProduct(models.Model):
             'product_purchase_ok': product["purchase_ok"],
             'price': price,
             'base_price': price,
-            'package_qty': package_qty
+            'package_qty': package_qty,
+            'sequence': 1000  # lowest priority for the new suppliers
         }
         res = api.create('product.supplierinfo', f)
 
@@ -503,8 +504,8 @@ class CagetteProducts(models.Model):
 
             sales_average_params = {
                 'ids': ptids, 
-                # 'from': '2019-04-10', 
-                # 'to': '2019-08-10',
+                'from': '2019-04-10', 
+                'to': '2019-08-10',
             }
             sales = CagetteProducts.get_template_products_sales_average(sales_average_params)
 

templates/orders/helper.html

@@ -16,14 +16,20 @@
 {% block content %}
 <div class="page_body">
     <div id="select_order_content" class="page_content txtcenter">
+        <div class="login_area">
+            {% include "common/conn_admin.html" %}
+        </div>
         <div id="new_order_area">
             <h2>Créer une nouvelle commande</h2>
-            <form id="new_order_form">
+            <div class="txtcenter" id="not_connected_content" style="display:none;">
+                <p>Vous devez vous connecter avec un compte Odoo pour accéder au module d'aide à la commande.</p>
+            </div>
+            <form id="new_order_form" style="display:none;">
                 <input type="text" id="new_order_name" placeholder="Nom de la commande...">
-                <button type="submit" class="btn btn--primary">Valider</button>
+                <button type="submit" class="btn btn--primary">C'est parti !</button>
             </form>
         </div>
-        <div id="existing_orders_area">
+        <div id="existing_orders_area" style="display:none;">
             <h2>Ou, continuer une commande en cours de création</h2>
             <div id="existing_orders"></div>
         </div>
@@ -34,9 +40,11 @@
             <button type="button" class="btn--danger" id="back_to_order_selection_from_main">
                 <i class="fas fa-arrow-left"></i>&nbsp; Retour
             </button>
-            <button type="button" class='btn--primary' id="do_inventory" style="display:none;">
-                Faire un inventaire
-            </button>
+            <div class="rights_buttons">
+                <button type="button" class='btn--primary' id="do_inventory" style="display:none;">
+                    Faire un inventaire
+                </button>
+            </div>
         </div>
     
         <div class="header txtcenter">