Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* [bug#52140] Change the stage of delivered.

Browse Source
This commit is contained in:
xieqiyu
2024-07-05 09:00:13 +08:00
committed by 孙广明
parent 328b708bef
commit 246e244c86
1 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/story/tao.php
+7 -20
View File
@@ -1456,9 +1456,8 @@ class storyTao extends storyModel
{
/* Delivering. */
$hasDelivering = false;
$allReleased = true;
$hasDone = false;
$allClosed = true;
$allDelivered = true;
foreach($children as $child)
{
if($child->stage == 'closed')
@@ -1472,30 +1471,18 @@ class storyTao extends storyModel
$hasDone = true;
}
}
else
{
$allClosed = false;
}
if(in_array($child->stage, array('released', 'delivering'))) $hasDelivering = true;
if($child->stage != 'released') $allReleased = false;
if(!in_array($child->stage, array('released', 'closed', 'delivered'))) $allDelivered = false;
}
if(($hasDelivering && !$allReleased) || ($hasDone && !$allClosed))
if($allDelivered)
{
$parentStage = 'delivered';
}
elseif($hasDelivering || $hasDone)
{
$parentStage = 'delivering';
}
else
{
/* Delivered. */
$allDelivered = true;
foreach($children as $child)
{
if($child->stage == 'closed' && $child->closedReason != 'done') continue;
if(!in_array($child->stage, array('released', 'delivered', 'closed'))) $allDelivered = false;
}
if($allDelivered) $parentStage = 'delivered';
}
}
}
}