Merge branch 'sgm_projecttest' into 'master'
Sgm projecttest See merge request easycorp/zentaopms!2775
This commit is contained in:
@@ -851,7 +851,7 @@ class projectModel extends model
|
||||
if(isset($project->budget) and $program->budget != 0)
|
||||
{
|
||||
$availableBudget = $this->loadModel('program')->getBudgetLeft($program);
|
||||
if($project->budget > $availableBudget) dao::$errors['budget'] = $this->lang->program->beyondParentBudget;
|
||||
if($availableBudget > 0 and $project->budget > $availableBudget) dao::$errors['budget'] = $this->lang->program->beyondParentBudget;
|
||||
}
|
||||
|
||||
/* Judge products not empty. */
|
||||
|
||||
@@ -883,6 +883,8 @@ class taskModel extends model
|
||||
*/
|
||||
public function update($taskID)
|
||||
{
|
||||
if($taskID <= 0) return;
|
||||
|
||||
$oldTask = $this->getByID($taskID);
|
||||
if($this->post->estimate < 0 or $this->post->left < 0 or $this->post->consumed < 0)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user