Merge branch 'master' into zentaopms_239

module/execution/view/edit.html.php

@@ -182,6 +182,9 @@
           <td id="plansBox" colspan="2">
             <div class='row'>
               <?php $i = 0;?>
+              <?php if(empty($linkedProducts)):?>
+              <div class="col-sm-4" id="plan0"><?php echo html::select("plans[][][]", $productPlans, '', "class='form-control chosen' multiple");?></div>
+              <?php else:?>
               <?php foreach($linkedProducts as $product):?>
               <?php foreach($linkedBranches[$product->id] as $branchID => $branch):?>
               <?php $plans = isset($productPlans[$product->id][$branchID]) ? $productPlans[$product->id][$branchID] : array();?>
@@ -189,6 +192,7 @@
               <?php $i++;?>
               <?php endforeach;?>
               <?php endforeach;?>
+              <?php endif;?>
             </div>
           </td>
         </tr>