From 17414b878a964b36984af43be5ad461678e59c48 Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Mon, 17 Jan 2022 20:52:19 +0000
Subject: [PATCH 1/2] fix: package.json to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-NODEFETCH-2342118
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 02c9b2abcb9..eb2362f26c7 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,6 @@
   "dependencies": {
     "chart.js": "^2.9.4",
     "cucumber-pretty": "^6.0.0",
-    "node-fetch": "^2.6.1"
+    "node-fetch": "^3.1.1"
   }
 }

From 6a9c9cc81aecda5e04cb58cb1ed40e74e950958c Mon Sep 17 00:00:00 2001
From: lvessiller <lvessiller@open-dsi.fr>
Date: Tue, 18 Jan 2022 16:36:50 +0100
Subject: [PATCH 2/2] NEW MAIN_SEARCH_CAT_OR_BY_DEFAULT const for search by
 category

---
 htdocs/product/list.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index a3ec599dea8..778565dd2cb 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -65,7 +65,12 @@ $search_barcode = GETPOST("search_barcode", 'alpha');
 $search_label = GETPOST("search_label", 'alpha');
 $search_type = GETPOST("search_type", 'int');
 $search_vatrate = GETPOST("search_vatrate", 'alpha');
-$searchCategoryProductOperator = (GETPOST('search_category_product_operator', 'int') ? GETPOST('search_category_product_operator', 'int') : 0);
+$searchCategoryProductOperator = 0;
+if (GETPOSTISSET('formfilteraction')) {
+	$searchCategoryProductOperator = GETPOST('search_category_product_operator', 'int');
+} elseif (!empty($conf->global->MAIN_SEARCH_CAT_OR_BY_DEFAULT)) {
+	$searchCategoryProductOperator = $conf->global->MAIN_SEARCH_CAT_OR_BY_DEFAULT;
+}
 $searchCategoryProductList = GETPOST('search_category_product_list', 'array');
 $search_tosell = GETPOST("search_tosell", 'int');
 $search_tobuy = GETPOST("search_tobuy", 'int');