[Vtigercrm-commits] [vtiger-commits] r9987 - in /vtigercrm/branches/5.0.3: Smarty/templates/DetailView.tpl modules/Accounts/DetailView.php modules/Contacts/DetailView.php modules/HelpDesk/DetailView.php modules/Leads/DetailView.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: richie
Date: Mon Dec 18 00:41:49 2006
New Revision: 9987

Log:
mail merge template check added

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl
    vtigercrm/branches/5.0.3/modules/Accounts/DetailView.php
    vtigercrm/branches/5.0.3/modules/Contacts/DetailView.php
    vtigercrm/branches/5.0.3/modules/HelpDesk/DetailView.php
    vtigercrm/branches/5.0.3/modules/Leads/DetailView.php

Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl Mon Dec 18 00:41:49 2006
@@ -293,10 +293,10 @@
 				{else}
 					{include file="DetailViewFields.tpl"}
 				{/if}
-			{else}
-                                <td class="dvtCellLabel" align=right>&nbsp;</td>
-                                <td class="dvtCellInfo" align=left >&nbsp;</td>
-			{/if}
+			   {else}
+				<td class="dvtCellLabel" align=right>&nbsp;</td>
+				<td class="dvtCellInfo" align=left >&nbsp;</td>
+			   {/if}
                                    {/foreach}
 						      </tr>	
 						   {/foreach}	
@@ -416,10 +416,14 @@
       					   <td class="rightMailMergeHeader"><b>{$WORDTEMPLATEOPTIONS}</b></td>
       				</tr>
       				<tr style="height:25px">
-      						<td class="rightMailMergeContent">
-          						<select name="mergefile">{foreach key=templid item=tempflname from=$TOPTIONS}<option value="{$templid}">{$tempflname}</option>{/foreach}</select>
-          						<input class="crmbutton small create" value="{$APP.LBL_MERGE_BUTTON_LABEL}" onclick="this.form.action.value='Merge';" type="submit"></input>
-      					  </td>
+					<td class="rightMailMergeContent">
+						{if $TEMPLATECOUNT neq 0}
+						<select name="mergefile">{foreach key=templid item=tempflname from=$TOPTIONS}<option value="{$templid}">{$tempflname}</option>{/foreach}</select>
+                                                   <input class="crmbutton small create" value="{$APP.LBL_MERGE_BUTTON_LABEL}" onclick="this.form.action.value='Merge';" type="submit"></input> 
+						{else}
+						<a href=index.php?module=Settings&action=upload&tempModule={$MODULE}>{$APP.LBL_CREATE_MERGE_TEMPLATE}</a>
+						{/if}
+					</td>
       				</tr>
   				</table>
 				</form>

Modified: vtigercrm/branches/5.0.3/modules/Accounts/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Accounts/DetailView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Accounts/DetailView.php Mon Dec 18 00:41:49 2006
@@ -92,6 +92,7 @@
 		$optionString[$tempVal["templateid"]]=$tempVal["filename"];
 		$tempVal = $adb->fetch_array($wordTemplateResult);
 	}
+	$smarty->assign("TEMPLATECOUNT",$tempCount);
 	$smarty->assign("WORDTEMPLATEOPTIONS",$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']);
         $smarty->assign("TOPTIONS",$optionString);
 }

Modified: vtigercrm/branches/5.0.3/modules/Contacts/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Contacts/DetailView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Contacts/DetailView.php Mon Dec 18 00:41:49 2006
@@ -99,6 +99,7 @@
 		$optionString[$tempVal["templateid"]]=$tempVal["filename"];
 		$tempVal = $adb->fetch_array($wordTemplateResult);
 	}
+	 $smarty->assign("TEMPLATECOUNT",$tempCount);
 	$smarty->assign("WORDTEMPLATEOPTIONS",$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']);
         $smarty->assign("TOPTIONS",$optionString);
 }

Modified: vtigercrm/branches/5.0.3/modules/HelpDesk/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/HelpDesk/DetailView.php (original)
+++ vtigercrm/branches/5.0.3/modules/HelpDesk/DetailView.php Mon Dec 18 00:41:49 2006
@@ -85,6 +85,7 @@
                 $optionString[$tempVal["templateid"]]=$tempVal["filename"];
                 $tempVal = $adb->fetch_array($wordTemplateResult);
         }
+	 $smarty->assign("TEMPLATECOUNT",$tempCount);
 	$smarty->assign("WORDTEMPLATEOPTIONS",$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']);
         $smarty->assign("TOPTIONS",$optionString);
 }

Modified: vtigercrm/branches/5.0.3/modules/Leads/DetailView.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Leads/DetailView.php (original)
+++ vtigercrm/branches/5.0.3/modules/Leads/DetailView.php Mon Dec 18 00:41:49 2006
@@ -106,6 +106,7 @@
 		$optionString[$tempVal["templateid"]] =$tempVal["filename"];
 		$tempVal = $adb->fetch_array($wordTemplateResult);
 	}
+	 $smarty->assign("TEMPLATECOUNT",$tempCount);
 	$smarty->assign("WORDTEMPLATEOPTIONS",$app_strings['LBL_SELECT_TEMPLATE_TO_MAIL_MERGE']);
         $smarty->assign("TOPTIONS",$optionString);
 }