[Vtigercrm-commits] [vtiger-commits] r6397 - in /vtigercrm/trunk: Smarty/templates/DetailViewUI.tpl Smarty/templates/DisplayFields.tpl include/language/en_us.lang.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: saraj
Date: Wed May 24 18:21:14 2006
New Revision: 6397

Log:
* Modified to display the Sales and Service in the Tax area as Sales Tax(%) and Service Tax(%) in Products module

Modified:
    vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
    vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
    vtigercrm/trunk/include/language/en_us.lang.php

Modified: vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl Wed May 24 18:21:14 2006
@@ -157,7 +157,7 @@
                              </td>
 						{elseif $keyid eq 83}<!-- Handle the Tax in Inventory -->
 							<td align="right" class="dvtCellLabel">
-							{$APP.LBL_VAT} :
+							{$APP.LBL_VAT} {$APP.COVERED_PERCENTAGE}
 							
 							</td>
 							<td class="dvtCellInfo" align="left">
@@ -167,7 +167,7 @@
 						   </tr>
 		   				   <tr>
 							<td align="right" class="dvtCellLabel">
-							{$APP.LBL_SALES} :
+							{$APP.LBL_SALES} {$APP.LBL_TAX} {$APP.COVERED_PERCENTAGE}
 							</td> 
 							<td class="dvtCellInfo" align="left">
 								{$SALES_TAX}
@@ -176,7 +176,7 @@
 						   </tr>
 				   		   <tr>
 							<td align="right" class="dvtCellLabel">
-								{$APP.LBL_SERVICE} :
+								{$APP.LBL_SERVICE} {$APP.LBL_TAX} {$APP.COVERED_PERCENTAGE}
 							</td>
 							<td class="dvtCellInfo" align="left" >
 								{$SERVICE_TAX}

Modified: vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DisplayFields.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DisplayFields.tpl Wed May 24 18:21:14 2006
@@ -492,7 +492,7 @@
 			{/if}
 
 			<td align="right" class="dvtCellLabel" style="border:0px solid red;">
-				{$APP.LBL_VAT} :
+				{$APP.LBL_VAT} {$APP.COVERED_PERCENTAGE}
 				<input type="checkbox" name="vat_check" id="vat_check" class="small" onclick="fnshowHide(this,'vat_tax')" {$vat_check}>
 			</td>
 			<td class="dvtCellInfo" align="left" style="border:0px solid red;">
@@ -502,7 +502,7 @@
 		   </tr>
 		   <tr>
 			<td align="right" class="dvtCellLabel" style="border:0px solid red;">
-				{$APP.LBL_SALES} :
+				{$APP.LBL_SALES} {$APP.LBL_TAX} {$APP.COVERED_PERCENTAGE}
 				<input type="checkbox" name="sales_check" id="sales_check" class="small" onClick="fnshowHide(this,'sales_tax')" {$sales_check}>
 			</td> 
 			<td class="dvtCellInfo" align="left" style="border:0px solid red;">
@@ -512,7 +512,7 @@
 		   </tr>
 		   <tr>
 			<td align="right" class="dvtCellLabel">
-				{$APP.LBL_SERVICE} :
+				{$APP.LBL_SERVICE} {$APP.LBL_TAX} {$APP.COVERED_PERCENTAGE}
 				<input type="checkbox" name="service_check" id="service_check" class="small" onClick="fnshowHide(this,'service_tax')" {$service_check}>
 			</td>
 			<td class="dvtCellInfo" align="left">

Modified: vtigercrm/trunk/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/include/language/en_us.lang.php (original)
+++ vtigercrm/trunk/include/language/en_us.lang.php Wed May 24 18:21:14 2006
@@ -870,6 +870,7 @@
 'LBL_SERVICE'=>'Service',
 'LBL_TAX_DETAILS'=>'Tax Details',
 'LBL_TAX_CALCULATION'=>'Tax Calculation',
+'COVERED_PERCENTAGE'=>'(%)',
 
 );