diff --git a/module/branch/model.php b/module/branch/model.php index a509fa14ce..9e91f48fb7 100644 --- a/module/branch/model.php +++ b/module/branch/model.php @@ -141,7 +141,7 @@ class branchModel extends model { if($products[$branch->product]->type == 'normal') { - $branchGroups[$branch->product][0] = ''; + if(strpos($params, 'ignoreNormal') === false) $branchGroups[$branch->product][0] = ''; } else { diff --git a/module/execution/control.php b/module/execution/control.php index 50facb576a..b5a72a88ca 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -2236,7 +2236,7 @@ class execution extends control $this->view->execution = $execution; $this->view->linkedProducts = $linkedProducts; $this->view->unmodifiableProducts = $unmodifiableProducts; - $this->view->branchGroups = $this->loadModel('branch')->getByProducts(array_keys($allProducts), '', $linkedBranches); + $this->view->branchGroups = $this->loadModel('branch')->getByProducts(array_keys($allProducts), 'ignoreNormal', $linkedBranches); $this->display(); }