diff --git a/module/project/control.php b/module/project/control.php index c04608cf83..402ef3a3df 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -233,21 +233,21 @@ class project extends control if(!empty($projectID)) { $project = $this->project->getByID($projectID); - $parentProgram = $this->loadModel('program')->getByID($selectedProgramID); - $budgetLeft = $this->program->getBudgetLeft($parentProgram); + $selectedProgram = $this->loadModel('program')->getByID($selectedProgramID); + $budgetLeft = $this->program->getBudgetLeft($selectedProgram); $availableBudget = $project->parent == $selectedProgramID ? $budgetLeft + $project->budget : $budgetLeft; } else { - $parentProgram = $this->loadModel('program')->getByID($selectedProgramID); - $availableBudget = $this->program->getBudgetLeft($parentProgram); + $selectedProgram = $this->loadModel('program')->getByID($selectedProgramID); + $availableBudget = $this->program->getBudgetLeft($selectedProgram); } $tip = ''; - if($budget != 0 && $budget !== null && $budget > $availableBudget) $tip = "" . $this->lang->project->budgetOverrun . zget($this->lang->project->currencySymbol, $parentProgram->budgetUnit) . $availableBudget . ""; + if($budget != 0 && $budget !== null && $budget > $availableBudget) $tip = "" . $this->lang->project->budgetOverrun . zget($this->lang->project->currencySymbol, $selectedProgram->budgetUnit) . $availableBudget . ""; $placeholder = ''; - if($parentProgram and $parentProgram->budget != 0) $placeholder = $this->lang->project->parentBudget . zget($this->lang->project->currencySymbol, $parentProgram->budgetUnit) . $availableBudget; + if($selectedProgram and $selectedProgram->budget != 0) $placeholder = $this->lang->project->parentBudget . zget($this->lang->project->currencySymbol, $selectedProgram->budgetUnit) . $availableBudget; $tipList = array('tip' => $tip, 'placeholder' => $placeholder); echo json_encode($tipList); diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php index e181130a96..343dca65c6 100755 --- a/module/project/view/edit.html.php +++ b/module/project/view/edit.html.php @@ -29,6 +29,7 @@ parent ? $lang->project->subAclList : $lang->project->aclList;?> project->edit->requiredFields;?> +budget);?>