[Vtigercrm-commits] [vtiger-commits] r11035 - in /vtigercrm/branches/5.0.3: Smarty/templates/Inventory/ProductDetails.tpl Smarty/templates/Inventory/ProductDetailsEditView.tpl include/fpdf/templates/body.php include/js/Inventory.js modules/Products/InventoryTaxAjax.php
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Fri May 25 03:32:31 EDT 2007
Author: saraj
Date: Fri May 25 01:32:19 2007
New Revision: 11035
Log:
Inventory Discount calculation, discount percentage appear twice in pdf. Fixes #3928
Modified:
vtigercrm/branches/5.0.3/Smarty/templates/Inventory/ProductDetails.tpl
vtigercrm/branches/5.0.3/Smarty/templates/Inventory/ProductDetailsEditView.tpl
vtigercrm/branches/5.0.3/include/fpdf/templates/body.php
vtigercrm/branches/5.0.3/include/js/Inventory.js
vtigercrm/branches/5.0.3/modules/Products/InventoryTaxAjax.php
Modified: vtigercrm/branches/5.0.3/Smarty/templates/Inventory/ProductDetails.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Inventory/ProductDetails.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Inventory/ProductDetails.tpl Fri May 25 01:32:19 2007
@@ -170,7 +170,7 @@
<!-- column 4 - Quantity - starts -->
<td class="crmTableRow small lineOnTop">
- <input id="qty1" name="qty1" type="text" class="small " style="width:50px" onfocus="this.className='detailedViewTextBoxOn'" onBlur="settotalnoofrows(); calcTotal(); loadTaxes_Ajax(1);" onChange="setDiscount(this,'1')" value=""/>
+ <input id="qty1" name="qty1" type="text" class="small " style="width:50px" onfocus="this.className='detailedViewTextBoxOn'" onBlur="settotalnoofrows();calcTotal(); loadTaxes_Ajax(1); setDiscount(this,'1'); calcTotal();" value=""/>
</td>
<!-- column 4 - Quantity - ends -->
@@ -180,7 +180,7 @@
<table width="100%" cellpadding="0" cellspacing="0">
<tr>
<td align="right">
- <input id="listPrice1" name="listPrice1" value="{$UNIT_PRICE}" type="text" class="small " style="width:70px" onBlur="calcTotal(); callTaxCalc(1);" onChange="setDiscount(this,'1')"/> <img src="{$IMAGE_PATH}pricebook.gif" onclick="priceBookPickList(this,1)">
+ <input id="listPrice1" name="listPrice1" value="{$UNIT_PRICE}" type="text" class="small " style="width:70px" onBlur="calcTotal();setDiscount(this,'1'); callTaxCalc(1);calcTotal();"/> <img src="{$IMAGE_PATH}pricebook.gif" onclick="priceBookPickList(this,1)">
</td>
</tr>
<tr>
@@ -194,16 +194,16 @@
<td align="right"><img src="{$IMAGE_PATH}close.gif" border="0" onClick="fnHidePopDiv('discount_div1')" style="cursor:pointer;"></td>
</tr>
<tr>
- <td align="left" class="lineOnTop"><input type="radio" name="discount1" checked onclick="setDiscount(this,1); callTaxCalc(1);"> {$APP.LBL_ZERO_DISCOUNT}</td>
+ <td align="left" class="lineOnTop"><input type="radio" name="discount1" checked onclick="setDiscount(this,1); callTaxCalc(1);calcTotal();"> {$APP.LBL_ZERO_DISCOUNT}</td>
<td class="lineOnTop"> </td>
</tr>
<tr>
- <td align="left"><input type="radio" name="discount1" onclick="setDiscount(this,1); callTaxCalc(1);"> % {$APP.LBL_OF_PRICE}</td>
- <td align="right"><input type="text" class="small" size="5" id="discount_percentage1" name="discount_percentage1" value="0" style="visibility:hidden" onBlur="setDiscount(this,1); callTaxCalc(1);"> %</td>
- </tr>
- <tr>
- <td align="left" nowrap><input type="radio" name="discount1" onclick="setDiscount(this,1); callTaxCalc(1);"> {$APP.LBL_DIRECT_PRICE_REDUCTION}</td>
- <td align="right"><input type="text" id="discount_amount1" name="discount_amount1" size="5" value="0" style="visibility:hidden" onBlur="setDiscount(this,1); callTaxCalc(1);"></td>
+ <td align="left"><input type="radio" name="discount1" onclick="setDiscount(this,1); callTaxCalc(1);calcTotal();"> % {$APP.LBL_OF_PRICE}</td>
+ <td align="right"><input type="text" class="small" size="5" id="discount_percentage1" name="discount_percentage1" value="0" style="visibility:hidden" onBlur="setDiscount(this,1); callTaxCalc(1);calcTotal();"> %</td>
+ </tr>
+ <tr>
+ <td align="left" nowrap><input type="radio" name="discount1" onclick="setDiscount(this,1); callTaxCalc(1);calcTotal();"> {$APP.LBL_DIRECT_PRICE_REDUCTION}</td>
+ <td align="right"><input type="text" id="discount_amount1" name="discount_amount1" size="5" value="0" style="visibility:hidden" onBlur="setDiscount(this,1); callTaxCalc(1);calcTotal();"></td>
</tr>
</table>
</div>
@@ -294,16 +294,16 @@
<td align="right"><img src="{$IMAGE_PATH}close.gif" border="0" onClick="fnHidePopDiv('discount_div_final')" style="cursor:pointer;"></td>
</tr>
<tr>
- <td align="left" class="lineOnTop"><input type="radio" name="discount_final" checked onclick="setDiscount(this,'_final'); calcGroupTax();"> {$APP.LBL_ZERO_DISCOUNT}</td>
+ <td align="left" class="lineOnTop"><input type="radio" name="discount_final" checked onclick="setDiscount(this,'_final'); calcGroupTax();calcTotal();"> {$APP.LBL_ZERO_DISCOUNT}</td>
<td class="lineOnTop"> </td>
</tr>
<tr>
- <td align="left"><input type="radio" name="discount_final" onclick="setDiscount(this,'_final'); calcGroupTax();"> % {$APP.LBL_OF_PRICE}</td>
- <td align="right"><input type="text" class="small" size="5" id="discount_percentage_final" name="discount_percentage_final" value="0" style="visibility:hidden" onBlur="setDiscount(this,'_final'); calcGroupTax();"> %</td>
+ <td align="left"><input type="radio" name="discount_final" onclick="setDiscount(this,'_final'); calcGroupTax();calcTotal();"> % {$APP.LBL_OF_PRICE}</td>
+ <td align="right"><input type="text" class="small" size="5" id="discount_percentage_final" name="discount_percentage_final" value="0" style="visibility:hidden" onBlur="setDiscount(this,'_final'); calcGroupTax();calcTotal();"> %</td>
</tr>
<tr>
- <td align="left" nowrap><input type="radio" name="discount_final" onclick="setDiscount(this,'_final'); calcGroupTax();"> {$APP.LBL_DIRECT_PRICE_REDUCTION}</td>
- <td align="right"><input type="text" id="discount_amount_final" name="discount_amount_final" size="5" value="0" style="visibility:hidden" onBlur="setDiscount(this,'_final'); calcGroupTax();"></td>
+ <td align="left" nowrap><input type="radio" name="discount_final" onclick="setDiscount(this,'_final'); calcGroupTax();calcTotal();"> {$APP.LBL_DIRECT_PRICE_REDUCTION}</td>
+ <td align="right"><input type="text" id="discount_amount_final" name="discount_amount_final" size="5" value="0" style="visibility:hidden" onBlur="setDiscount(this,'_final'); calcGroupTax();calcTotal();"></td>
</tr>
</table>
</div>
Modified: vtigercrm/branches/5.0.3/Smarty/templates/Inventory/ProductDetailsEditView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Inventory/ProductDetailsEditView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Inventory/ProductDetailsEditView.tpl Fri May 25 01:32:19 2007
@@ -203,7 +203,7 @@
<table width="100%" cellpadding="0" cellspacing="0">
<tr>
<td align="right">
- <input id="{$listPrice}" name="{$listPrice}" value="{$data.$listPrice}" type="text" class="small " style="width:70px" onBlur="calcTotal(); callTaxCalc('{$row_no}');" onChange="setDiscount(this,'{$row_no}')"/> <img src="{$IMAGE_PATH}pricebook.gif" onclick="priceBookPickList(this,'{$row_no}')">
+ <input id="{$listPrice}" name="{$listPrice}" value="{$data.$listPrice}" type="text" class="small " style="width:70px" onBlur="calcTotal(); setDiscount(this,'{$row_no}');callTaxCalc('{$row_no}');"/> <img src="{$IMAGE_PATH}pricebook.gif" onclick="priceBookPickList(this,'{$row_no}')">
</td>
</tr>
<tr>
@@ -217,16 +217,16 @@
<td align="right"><img src="{$IMAGE_PATH}close.gif" border="0" onClick="fnHidePopDiv('discount_div{$row_no}')" style="cursor:pointer;"></td>
</tr>
<tr>
- <td align="left" class="lineOnTop"><input type="radio" name="discount{$row_no}" {$data.$checked_discount_zero} onclick="setDiscount(this,'{$row_no}'); callTaxCalc('{$row_no}');"> {$APP.LBL_ZERO_DISCOUNT}</td>
+ <td align="left" class="lineOnTop"><input type="radio" name="discount{$row_no}" {$data.$checked_discount_zero} onclick="setDiscount(this,'{$row_no}'); callTaxCalc('{$row_no}');calcTotal();"> {$APP.LBL_ZERO_DISCOUNT}</td>
<td class="lineOnTop"> </td>
</tr>
<tr>
- <td align="left"><input type="radio" name="discount{$row_no}" onclick="setDiscount(this,'{$row_no}'); callTaxCalc('{$row_no}');" {$data.$checked_discount_percent}> % {$APP.LBL_OF_PRICE}</td>
- <td align="right"><input type="text" class="small" size="5" id="discount_percentage{$row_no}" name="discount_percentage{$row_no}" value="{$data.$discount_percent}" {$data.$style_discount_percent} onBlur="setDiscount(this,'{$row_no}'); callTaxCalc('{$row_no}');"> %</td>
- </tr>
- <tr>
- <td align="left" nowrap><input type="radio" name="discount{$row_no}" onclick="setDiscount(this,'{$row_no}'); callTaxCalc('{$row_no}');" {$data.$checked_discount_amount}> {$APP.LBL_DIRECT_PRICE_REDUCTION}</td>
- <td align="right"><input type="text" id="discount_amount{$row_no}" name="discount_amount{$row_no}" size="5" value="{$data.$discount_amount}" {$data.$style_discount_amount} onBlur="setDiscount(this,{$row_no}); callTaxCalc('{$row_no}');"></td>
+ <td align="left"><input type="radio" name="discount{$row_no}" onclick="setDiscount(this,'{$row_no}'); callTaxCalc('{$row_no}'); calcTotal();" {$data.$checked_discount_percent}> % {$APP.LBL_OF_PRICE}</td>
+ <td align="right"><input type="text" class="small" size="5" id="discount_percentage{$row_no}" name="discount_percentage{$row_no}" value="{$data.$discount_percent}" {$data.$style_discount_percent} onBlur="setDiscount(this,'{$row_no}'); callTaxCalc('{$row_no}'); calcTotal();"> %</td>
+ </tr>
+ <tr>
+ <td align="left" nowrap><input type="radio" name="discount{$row_no}" onclick="setDiscount(this,'{$row_no}'); callTaxCalc('{$row_no}'); calcTotal();" {$data.$checked_discount_amount}> {$APP.LBL_DIRECT_PRICE_REDUCTION}</td>
+ <td align="right"><input type="text" id="discount_amount{$row_no}" name="discount_amount{$row_no}" size="5" value="{$data.$discount_amount}" {$data.$style_discount_amount} onBlur="setDiscount(this,{$row_no}); callTaxCalc('{$row_no}'); calcTotal();"></td>
</tr>
</table>
</div>
@@ -347,16 +347,16 @@
<td align="right"><img src="{$IMAGE_PATH}close.gif" border="0" onClick="fnHidePopDiv('discount_div_final')" style="cursor:pointer;"></td>
</tr>
<tr>
- <td align="left" class="lineOnTop"><input type="radio" name="discount_final" checked onclick="setDiscount(this,'_final'); calcTotal(); calcGroupTax();"> {$APP.LBL_ZERO_DISCOUNT}</td>
+ <td align="left" class="lineOnTop"><input type="radio" name="discount_final" checked onclick="setDiscount(this,'_final'); calcGroupTax(); calcTotal();"> {$APP.LBL_ZERO_DISCOUNT}</td>
<td class="lineOnTop"> </td>
</tr>
<tr>
<td align="left"><input type="radio" name="discount_final" onclick="setDiscount(this,'_final'); calcTotal(); calcGroupTax();" {$FINAL.checked_discount_percentage_final}> % {$APP.LBL_OF_PRICE}</td>
- <td align="right"><input type="text" class="small" size="5" id="discount_percentage_final" name="discount_percentage_final" value="{$FINAL.discount_percentage_final}" {$FINAL.style_discount_percentage_final} onBlur="setDiscount(this,'_final'); calcTotal(); calcGroupTax();"> %</td>
+ <td align="right"><input type="text" class="small" size="5" id="discount_percentage_final" name="discount_percentage_final" value="{$FINAL.discount_percentage_final}" {$FINAL.style_discount_percentage_final} onBlur="setDiscount(this,'_final'); calcGroupTax(); calcTotal();"> %</td>
</tr>
<tr>
<td align="left" nowrap><input type="radio" name="discount_final" onclick="setDiscount(this,'_final'); calcTotal(); calcGroupTax();" {$FINAL.checked_discount_amount_final}> {$APP.LBL_DIRECT_PRICE_REDUCTION}</td>
- <td align="right"><input type="text" id="discount_amount_final" name="discount_amount_final" size="5" value="{$FINAL.discount_amount_final}" {$FINAL.style_discount_amount_final} onBlur="setDiscount(this,'_final'); calcTotal(); calcGroupTax();"></td>
+ <td align="right"><input type="text" id="discount_amount_final" name="discount_amount_final" size="5" value="{$FINAL.discount_amount_final}" {$FINAL.style_discount_amount_final} onBlur="setDiscount(this,'_final'); calcGroupTax(); calcTotal();"></td>
</tr>
</table>
</div>
Modified: vtigercrm/branches/5.0.3/include/fpdf/templates/body.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/fpdf/templates/body.php (original)
+++ vtigercrm/branches/5.0.3/include/fpdf/templates/body.php Fri May 25 01:32:19 2007
@@ -166,7 +166,7 @@
//For alignment
if($final_price_discount_percent != '')
- $data= $app_strings['LBL_DISCOUNT'].": $final_price_discount_percent ".$price_discount."";
+ $data= $app_strings['LBL_DISCOUNT'].": $final_price_discount_percent";// ".$price_discount."";
else
$data= $app_strings['LBL_DISCOUNT'].":";// ".$price_discount."";
Modified: vtigercrm/branches/5.0.3/include/js/Inventory.js
==============================================================================
--- vtigercrm/branches/5.0.3/include/js/Inventory.js (original)
+++ vtigercrm/branches/5.0.3/include/js/Inventory.js Fri May 25 01:32:19 2007
@@ -139,7 +139,10 @@
var tax_type = document.getElementById("taxtype").value;
//if the tax type is individual then add the tax with net price
if(tax_type == 'individual')
+ {
+ callTaxCalc(i);
netprice = totalAfterDiscount+eval(document.getElementById("taxTotal"+rowId).innerHTML);
+ }
else
netprice = totalAfterDiscount;
@@ -147,7 +150,6 @@
}
}
- calcGroupTax();
calcGrandTotal();
}
@@ -174,7 +176,8 @@
// alert(netTotal);
document.getElementById("netTotal").innerHTML = netTotal;
document.getElementById("subtotal").value = netTotal;
-
+ setDiscount(this,'_final');
+ calcGroupTax();
//Tax and Adjustment values will be taken when they are valid integer or decimal values
//if(/^-?(0|[1-9]{1}\d{0,})(\.(\d{1}\d{0,}))?$/.test(document.getElementById("txtTax").value))
// txtTaxVal = parseFloat(getObj("txtTax").value);
@@ -560,7 +563,7 @@
//List Price with Discount, Total after Discount and Tax labels
colfive.className = "crmTableRow small"
- colfive.innerHTML='<table width="100%" cellpadding="0" cellspacing="0"><tr><td align="right"><input id="listPrice'+count+'" name="listPrice'+count+'" value="0.00" type="text" class="small " style="width:70px" onBlur="calcTotal(); callTaxCalc('+count+');" onChange="setDiscount(this,'+count+')"/> <img src="'+image_path+'pricebook.gif" onclick="priceBookPickList(this,'+count+')"></td></tr><tr><td align="right" style="padding:5px;" nowrap> (-) <b><a href="javascript:doNothing();" onClick="displayCoords(this,\'discount_div'+count+'\',\'discount\','+count+')" >'+product_labelarr.DISCOUNT+'</a> : </b><div class=\"discountUI\" id=\"discount_div'+count+'"><input type="hidden" id="discount_type'+count+'" name="discount_type'+count+'" value=""><table width="100%" border="0" cellpadding="5" cellspacing="0" class="small"><tr><td id="discount_div_title'+count+'" nowrap align="left" ></td><td align="right"><img src="'+image_path+'close.gif" border="0" onClick="fnHidePopDiv(\'discount_div'+count+'\')" style="cursor:pointer;"></td></tr><tr><td align="left" class="lineOnTop"><input type="radio" name="discount'+count+'" checked onclick="setDiscount(this,'+count+'); callTaxCalc('+count+');"> '+product_labelarr.ZERO_DISCOUNT+'</td><td class="lineOnTop"> </td></tr><tr><td align="left"><input type="radio" name="discount'+count+'" onclick="setDiscount(this,'+count+'); callTaxCalc('+count+');"> % '+product_labelarr.PERCENT_OF_PRICE+' </td><td align="right"><input type="text" class="small" size="2" id="discount_percentage'+count+'" name="discount_percentage'+count+'" value="0" style="visibility:hidden" onBlur="setDiscount(this,'+count+'); callTaxCalc('+count+');"> %</td></tr><tr><td align="left" nowrap><input type="radio" name="discount'+count+'" onclick="setDiscount(this,'+count+'); callTaxCalc('+count+');"> '+product_labelarr.DIRECT_PRICE_REDUCTION+'</td><td align="right"><input type="text" id="discount_amount'+count+'" name="discount_amount'+count+'" size="5" value="0" style="visibility:hidden" onBlur="setDiscount(this,'+count+'); callTaxCalc('+count+');"></td></tr></table></div></td></tr><tr> <td align="right" style="padding:5px;" nowrap><b>'+product_labelarr.TOTAL_AFTER_DISCOUNT+' :</b></td></tr><tr id="individual_tax_row'+count+'" class="TaxShow"><td align="right" style="padding:5px;" nowrap>(+) <b><a href="javascript:doNothing();" onClick="displayCoords(this,\'tax_div'+count+'\',\'tax\','+count+')" >'+product_labelarr.TAX+' </a> : </b><div class="discountUI" id="tax_div'+count+'"></div></td></tr></table> ';
+ colfive.innerHTML='<table width="100%" cellpadding="0" cellspacing="0"><tr><td align="right"><input id="listPrice'+count+'" name="listPrice'+count+'" value="0.00" type="text" class="small " style="width:70px" onBlur="calcTotal();setDiscount(this,'+count+');callTaxCalc('+count+'); calcTotal();"/> <img src="'+image_path+'pricebook.gif" onclick="priceBookPickList(this,'+count+')"></td></tr><tr><td align="right" style="padding:5px;" nowrap> (-) <b><a href="javascript:doNothing();" onClick="displayCoords(this,\'discount_div'+count+'\',\'discount\','+count+')" >'+product_labelarr.DISCOUNT+'</a> : </b><div class=\"discountUI\" id=\"discount_div'+count+'"><input type="hidden" id="discount_type'+count+'" name="discount_type'+count+'" value=""><table width="100%" border="0" cellpadding="5" cellspacing="0" class="small"><tr><td id="discount_div_title'+count+'" nowrap align="left" ></td><td align="right"><img src="'+image_path+'close.gif" border="0" onClick="fnHidePopDiv(\'discount_div'+count+'\')" style="cursor:pointer;"></td></tr><tr><td align="left" class="lineOnTop"><input type="radio" name="discount'+count+'" checked onclick="setDiscount(this,'+count+'); callTaxCalc('+count+');calcTotal();"> '+product_labelarr.ZERO_DISCOUNT+'</td><td class="lineOnTop"> </td></tr><tr><td align="left"><input type="radio" name="discount'+count+'" onclick="setDiscount(this,'+count+'); callTaxCalc('+count+');calcTotal();"> % '+product_labelarr.PERCENT_OF_PRICE+' </td><td align="right"><input type="text" class="small" size="2" id="discount_percentage'+count+'" name="discount_percentage'+count+'" value="0" style="visibility:hidden" onBlur="setDiscount(this,'+count+'); callTaxCalc('+count+');calcTotal();"> %</td></tr><tr><td align="left" nowrap><input type="radio" name="discount'+count+'" onclick="setDiscount(this,'+count+'); callTaxCalc('+count+');calcTotal();"> '+product_labelarr.DIRECT_PRICE_REDUCTION+'</td><td align="right"><input type="text" id="discount_amount'+count+'" name="discount_amount'+count+'" size="5" value="0" style="visibility:hidden" onBlur="setDiscount(this,'+count+'); callTaxCalc('+count+');calcTotal();"></td></tr></table></div></td></tr><tr> <td align="right" style="padding:5px;" nowrap><b>'+product_labelarr.TOTAL_AFTER_DISCOUNT+' :</b></td></tr><tr id="individual_tax_row'+count+'" class="TaxShow"><td align="right" style="padding:5px;" nowrap>(+) <b><a href="javascript:doNothing();" onClick="displayCoords(this,\'tax_div'+count+'\',\'tax\','+count+')" >'+product_labelarr.TAX+' </a> : </b><div class="discountUI" id="tax_div'+count+'"></div></td></tr></table> ';
//Total and Discount, Total after Discount and Tax details
colsix.className = "crmTableRow small"
@@ -663,7 +666,6 @@
document.getElementById("discountTotal"+curr_row).innerHTML = roundValue(document.getElementById("discount_amount"+curr_row).value.toString());
}
- calcTotal();
}
//This function is added to call the tax calculation function
@@ -707,7 +709,6 @@
}
document.getElementById("taxTotal"+curr_row).innerHTML = roundValue(tax_total);
- calcTotal();
}
function calcGroupTax()
Modified: vtigercrm/branches/5.0.3/modules/Products/InventoryTaxAjax.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Products/InventoryTaxAjax.php (original)
+++ vtigercrm/branches/5.0.3/modules/Products/InventoryTaxAjax.php Fri May 25 01:32:19 2007
@@ -45,7 +45,7 @@
$tax_div .= '
<tr>
<td align="left" class="lineOnTop">
- <input type="text" class="small" size="5" name="'.$tax_name_percentage.'" id="'.$tax_name_percentage.'" value="'.$tax_percentage.'" onBlur="calcCurrentTax(\''.$tax_name_percentage.'\','.$rowid.','.$i.')"> %
+ <input type="text" class="small" size="5" name="'.$tax_name_percentage.'" id="'.$tax_name_percentage.'" value="'.$tax_percentage.'" onBlur="calcCurrentTax(\''.$tax_name_percentage.'\','.$rowid.','.$i.');calcTotal();"> %
<input type="hidden" id="'.$tax_id_name.'" value="'.$tax_name_percentage.'">
</td>
<td align="center" class="lineOnTop">'.$tax_label.'</td>
More information about the vtigercrm-commits
mailing list