Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

module/execution/control.php

@@ -1733,7 +1733,7 @@ class execution extends control
             $this->view->linkedBranches = $linkedBranches;
         }
 
-        if(!empty($project->hasProduct))
+        if(empty($project->hasProduct))
         {
             $shadowProduct = $this->loadModel('product')->getShadowProductByProject($project->id);
             $productPlan   = $this->loadModel('productplan')->getPairs($shadowProduct->id, '0,0', 'noclosed,unexpired', true);
@@ -1744,7 +1744,7 @@ class execution extends control
             if(isset($_POST['attribute']) and in_array($_POST['attribute'], array('request', 'design', 'review'))) unset($_POST['plans']);
 
             /* No product execution link plans. */
-            if(!empty($project->hasProduct) and !empty($_POST['plans']))
+            if(empty($project->hasProduct) and !empty($_POST['plans']))
             {
                 $plansItem = array();
                 foreach($_POST['plans'] as $planItem)

module/project/js/create.js

@@ -146,7 +146,9 @@ function setParentProgram(parentProgram)
         selectedParent     = parentProgram != 0 ? data.selectedProgramPath[1] : 0;
         lastSelectedParent = lastSelectedID != 0 ? data.objectPath[1] : 0;
 
-        if(selectedParent != lastSelectedParent)
+        var hasProduct = $('[name=hasProduct]:checked').val();
+
+        if((selectedParent != lastSelectedParent) && hasProduct == 1)
         {
             $('#budget').val('');