resolved conflict

orders/static/css/oders_helper_style.css

@@ -115,6 +115,13 @@
     margin-left: 5px;
 }
 
+.custom_cell_content {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+}
+
 .product_qty_input {
     width: 100px;
 }

orders/views.py

@@ -42,7 +42,7 @@ def get_supplier_products(request):
     """ Get supplier products """
 
     sid = request.GET.get('sid', '')
-    res = CagetteProducts.get_products_by_supplier(sid)
+    res = CagetteProducts.get_products_for_order_helper(sid)
     
     if 'error' in res:
         return JsonResponse(res, status=500)

products/models.py

@@ -171,19 +171,6 @@ class CagetteProduct(models.Model):
 
         return res
 
-    @staticmethod
-    def get_product_for_help_order_line(product_tmpl_id):
-        api = OdooAPI()
-        res = []
-        try:
-            f = ["id", "state", "name", "default_code", "qty_available", "incoming_qty", "uom_id", "purchase_ok"]
-            # TODO fetch only 'purchase_ok' products ?
-            c = [['id', '=', product_tmpl_id], ['purchase_ok', '=', True]]
-            products_t = api.search_read('product.template', c, f)
-            res = [p for p in products_t if p["state"] != "end" and p["state"] != "obsolete"]
-        except Exception as e:
-            coop_logger.error("Odoo API get_product_for_help_order_line (tpl_id = %s) : %s", str(product_tmpl_id), str(e))
-        return res
 
 class CagetteProducts(models.Model):
     """Initially used to make massive barcode update."""
@@ -468,7 +455,12 @@ class CagetteProducts(models.Model):
         return res
 
     @staticmethod
-    def get_products_by_supplier(supplier_id):
+    def get_products_for_order_helper(supplier_id, pids = []):
+        """ 
+            One of the two parameters must be set.
+            Get products by supplier if a supplier_id is set. 
+            If supplier_id is None, get products specified in pids.
+        """
         api = OdooAPI()
         res = {}
 
@@ -476,6 +468,7 @@ class CagetteProducts(models.Model):
         try:
             today = datetime.date.today().strftime("%Y-%m-%d")
 
+            if supplier_id is not None:
                 # Get products/supplier relation
                 f = ["product_tmpl_id", 'date_start', 'date_end', 'package_qty', 'price']
                 c = [['name', '=', int(supplier_id)]]
@@ -488,6 +481,8 @@ class CagetteProducts(models.Model):
                         and (p["date_start"] is False or p["date_end"] is not False and p["date_start"] <= today) 
                         and (p["date_end"] is False or p["date_end"] is not False and p["date_end"] >= today)):
                         ptids.append(p["product_tmpl_id"][0])
+            else:
+                ptids = pids
 
             # Get products templates
             f = [
@@ -506,7 +501,8 @@ class CagetteProducts(models.Model):
             products_t = api.search_read('product.template', c, f)
             filtered_products_t = [p for p in products_t if p["state"] != "end" and p["state"] != "obsolete"]
 
-            sales_average_params = {'ids': ptids, 
+            sales_average_params = {
+                'ids': ptids, 
                 #'from': '2019-06-10', 
                 #'to': '2019-08-10',
             }
@@ -519,6 +515,7 @@ class CagetteProducts(models.Model):
             
             # Add supplier data to product data
             for i, fp in enumerate(filtered_products_t):
+                if supplier_id is not None:
                     psi_item = next(item for item in psi if item["product_tmpl_id"] is not False and item["product_tmpl_id"][0] == fp["id"])
                     filtered_products_t[i]['suppliersinfo'] = [{
                         'supplier_id': int(supplier_id),
@@ -534,7 +531,7 @@ class CagetteProducts(models.Model):
 
             res["products"] = filtered_products_t
         except Exception as e:
-            coop_logger.error('get_products_by_supplier %s (%s)', str(e), str(supplier_id))
+            coop_logger.error('get_products_for_order_helper %s (%s)', str(e), str(supplier_id))
             res["error"] = str(e)
 
         return res

products/urls.py

@@ -5,7 +5,7 @@ from . import views
 urlpatterns = [
     url(r'^$', views.home),
     url(r'^simple_list$', views.get_simple_list),
-    url(r'^get_product_for_help_order_line/([0-9]+)$', views.get_product_for_help_order_line),
+    url(r'^get_product_for_order_helper/([0-9]+)$', views.get_product_for_order_helper),
     url(r'^get_product_data$', views.get_product_data),
     url(r'^get_products_stdprices$', views.get_products_stdprices),
     url(r'^update_product_stock$', views.update_product_stock),

products/views.py

@@ -39,12 +39,12 @@ def get_simple_list(request):
         return JsonResponse(res, safe=False)
 
 
-def get_product_for_help_order_line(request, tpl_id):
+def get_product_for_order_helper(request, tpl_id):
     res = {}
     try:
-        result = CagetteProduct.get_product_for_help_order_line(tpl_id)
-        if len(result) == 1:
-            res = result[0]
+        result = CagetteProducts.get_products_for_order_helper(None, [int(tpl_id)])
+        if len(result["products"]) == 1:
+            res = result["products"][0]
     except Exception as e:
         coop_logger.error("get_product_for_help_order_line : %s", str(e))
         res['error'] = str(e)