diff --git a/module/execution/control.php b/module/execution/control.php
index de72a5abee..d768d36b23 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -4176,7 +4176,19 @@ class execution extends control
include $this->app->getModulePath('', 'execution') . 'lang/' . $this->app->getClientLang() . '.php';
}
- $haveDraft = sprintf($this->lang->execution->haveDraft, $count);
+ $executionProductList = $this->loadModel('product')->getProducts($executionID);
+ $multiBranchProduct = false;
+ foreach($executionProductList as $executionProduct)
+ {
+ if($executionProduct->type != 'normal')
+ {
+ $multiBranchProduct = true;
+ break;
+ }
+ }
+ $importPlanStoryTips = $multiBranchProduct ? $this->lang->execution->haveBranchDraft : $this->lang->execution->haveDraft;
+
+ $haveDraft = sprintf($importPlanStoryTips, $count);
if(!$execution->multiple or $moduleName == 'projectstory') $haveDraft = str_replace($this->lang->executionCommon, $this->lang->projectCommon, $haveDraft);
if($count != 0) echo js::alert($haveDraft) . js::locate($this->createLink($moduleName, $fromMethod, $param));
return print(js::locate(helper::createLink($moduleName, $fromMethod, $param)));
diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php
index c5527bf317..e325edbcdc 100644
--- a/module/execution/lang/de.php
+++ b/module/execution/lang/de.php
@@ -351,7 +351,8 @@ $lang->execution->howToUpdateBurn = " Story verknüpfen。";
-$lang->execution->haveDraft = "There are %s draft stories or not associated with this {$lang->executionCommon} can't be linked.";
+$lang->execution->haveBranchDraft = "There are %s draft stories or not associated with this {$lang->executionCommon} can't be linked.";
+$lang->execution->haveDraft = "There are %s draft stories with this {$lang->executionCommon} can't be linked.";
$lang->execution->doneExecutions = 'Erledigt';
$lang->execution->selectDept = 'Abteilung wählen';
$lang->execution->selectDeptTitle = 'Abteilung wählen';
diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php
index 62c06847a5..d273799d4b 100644
--- a/module/execution/lang/en.php
+++ b/module/execution/lang/en.php
@@ -351,7 +351,8 @@ $lang->execution->howToUpdateBurn = " Link Stories now.";
-$lang->execution->haveDraft = "There are %s draft stories or not associated with this {$lang->executionCommon} can't be linked.";
+$lang->execution->haveBranchDraft = "There are %s draft stories or not associated with this {$lang->executionCommon} can't be linked.";
+$lang->execution->haveDraft = "There are %s draft stories with this {$lang->executionCommon} can't be linked.";
$lang->execution->doneExecutions = 'Finished';
$lang->execution->selectDept = 'Select Department';
$lang->execution->selectDeptTitle = 'Select User';
diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php
index 434e14a929..a107beff48 100644
--- a/module/execution/lang/fr.php
+++ b/module/execution/lang/fr.php
@@ -351,7 +351,8 @@ $lang->execution->howToUpdateBurn = "executionCommon} qui sont associées à {$lang->productCommon} et vérifiez qu'elles ont bien été validées.";
$lang->execution->projectNoStories = "No story can be linked. Please check whether there is any story in project and make sure it has been reviewed.";
$lang->execution->productStories = "Les stories associées au {$lang->executionCommon} sont une portion des stories associées au {$lang->productCommon}. Les stories ne peuvent être associées à un {$lang->executionCommon} qu'après avoir été validées. Associer Stories maintenant.";
-$lang->execution->haveDraft = "There are %s draft stories or not associated with this {$lang->executionCommon} can't be linked.";
+$lang->execution->haveBranchDraft = "There are %s draft stories or not associated with this {$lang->executionCommon} can't be linked.";
+$lang->execution->haveDraft = "There are %s draft stories with this {$lang->executionCommon} can't be linked.";
$lang->execution->doneExecutions = 'Terminé';
$lang->execution->selectDept = 'Sélection Compartiment';
$lang->execution->selectDeptTitle = 'Sélection Utilisateur';
diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index d512818ee7..ce258165b5 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -351,7 +351,8 @@ $lang->execution->howToUpdateBurn = "关联{$lang->SRCommon}。";
-$lang->execution->haveDraft = "有%s条草稿状态或非本{$lang->executionCommon}关联分支的{$lang->SRCommon}无法关联到该{$lang->executionCommon}";
+$lang->execution->haveBranchDraft = "有%s条草稿状态或非本{$lang->executionCommon}关联分支的{$lang->SRCommon}无法关联到该{$lang->executionCommon}";
+$lang->execution->haveDraft = "有%s条草稿状态的{$lang->SRCommon}无法关联到该{$lang->executionCommon}";
$lang->execution->doneExecutions = '已结束';
$lang->execution->selectDept = '选择部门';
$lang->execution->selectDeptTitle = '选择一个部门的成员';