From 5e8b17d6df37af8c1c0542920de84223f62b69e0 Mon Sep 17 00:00:00 2001
From: songchenxuan <songchenxuan@easycorp.ltd>
Date: Thu, 23 Dec 2021 17:11:35 +0800
Subject: [PATCH 1/2] *Fix bug #17399.

---
 module/product/control.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/product/control.php b/module/product/control.php
index 2091ceb769..4bf1aba742 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -775,7 +775,7 @@ class product extends control
             $this->executeHooks($productID);
 
             if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess));
-            die(js::locate($this->createLink('product', 'browse'), 'parent'));
+            die(js::locate($this->createLink('product', 'all'), 'parent'));
         }
     }
 

From 5a8966c8e87d37fcdbf34e895625dcc60d6610ab Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Thu, 23 Dec 2021 17:28:29 +0800
Subject: [PATCH 2/2] * Fix bug #17903.

---
 module/branch/js/manage.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/branch/js/manage.js b/module/branch/js/manage.js
index 49f87ac8e8..6c5524828e 100644
--- a/module/branch/js/manage.js
+++ b/module/branch/js/manage.js
@@ -126,7 +126,7 @@ $(function()
         }
 
         var branchNames = Object.values(branchPairs);
-        if(isChecked && branchNames.includes($('#name').val()) !== -1)
+        if(isChecked && branchNames.indexOf($('#name').val()) !== -1)
         {
             alert(branchLang.existName);
             return false;