Merge branch '280_liuhong_task' into 'zentaopms_277'

* Finish task #80189 for Closed plans are not shown in Kanban.

See merge request easycorp/zentaopms!6651

module/kanban/model.php

@@ -810,7 +810,7 @@ class kanbanModel extends model
         }
         elseif($branchID == 'all')
         {
-            $branches = $this->branch->getPairs($product->id);
+            $branches = $this->branch->getPairs($product->id, 'active');
         }
         elseif($branchID == BRANCH_MAIN)
         {

module/productplan/control.php

@@ -358,7 +358,7 @@ class productplan extends control
             else
             {
                 $planGroup = $this->productplan->getGroupByProduct($product->id, 'skipParent', '', $orderBy);
-                $branches  = $this->branch->getPairs($product->id);
+                $branches  = $this->branch->getPairs($product->id, 'active');
 
                 foreach($branches as $id => $name)
                 {