[Vtigercrm-commits] [vtiger-commits] r7587 - in /vtigercrm/trunk: Smarty/templates/Inventory/ProductDetails.tpl Smarty/templates/Inventory/ProductDetailsEditView.tpl include/js/general.js
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Tue Jun 27 12:36:24 EDT 2006
Author: saraj
Date: Tue Jun 27 10:36:17 2006
New Revision: 7587
Log:
* Removed the readonly for the ListPrice field where as now we can change the ListPrice value
Modified:
vtigercrm/trunk/Smarty/templates/Inventory/ProductDetails.tpl
vtigercrm/trunk/Smarty/templates/Inventory/ProductDetailsEditView.tpl
vtigercrm/trunk/include/js/general.js
Modified: vtigercrm/trunk/Smarty/templates/Inventory/ProductDetails.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/ProductDetails.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/ProductDetails.tpl Tue Jun 27 10:36:17 2006
@@ -56,7 +56,7 @@
</td>
<td nowrap valign="top">
- <input type="text" id="txtListPrice1" name="txtListPrice1" value="{$UNIT_PRICE}" class="txtBox" readonly onBlur="FindDuplicate(); settotalnoofrows(); calcTotal(this)"/> <img src="themes/blue/images/pricebook.gif" onclick="priceBookPickList(this)" style="cursor: pointer;" title="Price Book" align="absmiddle" />
+ <input type="text" id="txtListPrice1" name="txtListPrice1" value="{$UNIT_PRICE}" class="txtBox" onBlur="FindDuplicate(); settotalnoofrows(); calcTotal(this)"/> <img src="themes/blue/images/pricebook.gif" onclick="priceBookPickList(this)" style="cursor: pointer;" title="Price Book" align="absmiddle" />
</td>
<!-- Added for Tax calculation-->
<td valign="top" style="padding-bottom:5px;">
Modified: vtigercrm/trunk/Smarty/templates/Inventory/ProductDetailsEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Inventory/ProductDetailsEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Inventory/ProductDetailsEditView.tpl Tue Jun 27 10:36:17 2006
@@ -71,7 +71,7 @@
{$data.$unitPrice}
</td>
<td nowrap valign="top">
- <input type="text" name="{$txtListPrice}" value="{$data.$txtListPrice}" class="txtBox" readonly onBlur="FindDuplicate(); settotalnoofrows(); calcTotal(this)"/>
+ <input type="text" name="{$txtListPrice}" value="{$data.$txtListPrice}" class="txtBox" onBlur="FindDuplicate(); settotalnoofrows(); calcTotal(this)"/>
<img src="themes/blue/images/pricebook.gif" onclick="priceBookPickList(this)" style="cursor: pointer;" title="Price Book" align="absmiddle" />
</td>
<!-- Added for Tax calculation-->
Modified: vtigercrm/trunk/include/js/general.js
==============================================================================
--- vtigercrm/trunk/include/js/general.js (original)
+++ vtigercrm/trunk/include/js/general.js Tue Jun 27 10:36:17 2006
@@ -1443,7 +1443,7 @@
coltwo.innerHTML="<div id='qtyInStock"+count+"'>";
colthree.innerHTML="<input type='text' id='txtQty"+count+"' name='txtQty"+count+"' class='detailedViewTextBox' onfocus='this.className=\"detailedViewTextBoxOn\"' onBlur='this.className=\"detailedViewTextBox\"; FindDuplicate(); settotalnoofrows(); calcTotal(this);' /> ";
colfour.innerHTML=" </div><div id='unitPrice"+count+"'></div>";
- colfive.innerHTML="<input type='text' id='txtListPrice"+count+"' name='txtListPrice"+count+"' class='txtBox' readonly onBlur='FindDuplicate(); settotalnoofrows(); calcTotal(this)'> <img src='themes/blue/images/pricebook.gif' onClick='priceBookPickList(this)' align='absmiddle' style='cursor:hand;cursor:pointer' title='Price Book' /> ";
+ colfive.innerHTML="<input type='text' id='txtListPrice"+count+"' name='txtListPrice"+count+"' class='txtBox' onBlur='FindDuplicate(); settotalnoofrows(); calcTotal(this)'> <img src='themes/blue/images/pricebook.gif' onClick='priceBookPickList(this)' align='absmiddle' style='cursor:hand;cursor:pointer' title='Price Book' /> ";
//Added for tax calculation
colsix.innerHTML="<input type='text' id='txtTaxTotal"+count+"' name='txtTaxTotal"+count+"' value='' class='detailedViewTextBox' style='width:65%;'><input type='hidden' id='hdnTaxTotal"+count+"' name='hdnTaxTotal"+count+"'> <input type='button' name='showTax' value=' ... ' class='classBtnSmall' onclick='fnshow_Hide(\"tax_Lay"+count+"\");'><div id='tax_Lay"+count+"' style='width:93%;position:relative;border:1px dotted #CCCCCC;display:none;background-color:#FFFFCC;top:5px;padding:5px;'><table width='100%' border='0' cellpadding='0' cellspacing='0' class='small'><tr id='vatrow"+count+"'><td align='left' width='40%' style='border:0px solid red;'><input type='text' id='txtVATTax"+count+"' name='txtVATTax"+count+"' class='txtBox' onBlur='ValidateTax(\"txtVATTax"+count+"\"); calcTotal(this);'/>% </td><td width='20%' align='right' style='border:0px solid red;'> VAT</td><td align='left' width='40%' style='border:0px solid red;'><input type='text' id='txtVATTaxTotal"+count+"' name='txtVATTaxTotal"+count+"' class='txtBox' onBlur='ValidateTax(\"txtVATTaxTotal"+count+"\"); calcTotal(this);'/></td></tr><tr id='salesrow"+count+"'><td align='left' style='border:0px solid red;'><input type='text' id='txtSalesTax"+count+"' name='txtSalesTax"+count+"' class='txtBox' onBlur='ValidateTax(\"txtSalesTax"+count+"\"); calcTotal(this);'/>% </td><td align='right' style='border:0px solid red;'> Sales</td><td align='left' style='border:0px solid red;'><input type='text' id='txtSalesTaxTotal"+count+"' name='txtSalesTaxTotal"+count+"' class='txtBox' onBlur='ValidateTax(\"txtSalesTaxTotal"+count+"\"); calcTotal(this);'/></td></tr><tr id='servicerow"+count+"'><td align='left' style='border:0px solid red;'><input type='text' id='txtServiceTax"+count+"' name='txtServiceTax"+count+"' class='txtBox' onBlur='ValidateTax(\"txtServiceTax"+count+"\"); calcTotal(this);'/>% </td><td align='right' style='border:0px solid red;'> Service</td><td align='left' style='border:0px solid red;'><input type='text' id='txtServiceTaxTotal"+count+"' name='txtServiceTaxTotal"+count+"' class='txtBox' onBlur='ValidateTax(\"txtServiceTaxTotal"+count+"\"); calcTotal(this);'/></td></tr></table></div>";
@@ -1482,7 +1482,7 @@
colone.innerHTML="<input type='text'id='txtProduct"+count+"' name='txtProduct"+count+"' class='txtBox' readonly/> <img src='themes/blue/images/search.gif' onclick='productPickList(this,\""+module+"\")' align='absmiddle' /><input type='hidden' id='hdnProductId"+count+"' name='hdnProductId"+count+"'>";
coltwo.innerHTML="<input type='text'id='txtQty"+count+"' name='txtQty"+count+"' class='detailedViewTextBox' onfocus='this.className=\"detailedViewTextBoxOn\"' onBlur='this.className=\"detailedViewTextBox\"; FindDuplicate(); settotalnoofrows(); calcTotal(this);' /> ";
colthree.innerHTML=" <div id='unitPrice"+count+"'></div>";
- colfour.innerHTML="<input type='text' id='txtListPrice"+count+"' name='txtListPrice"+count+"' class='txtBox' readonly onBlur='FindDuplicate(); settotalnoofrows(); calcTotal(this)'> <img src='themes/blue/images/pricebook.gif' onClick='priceBookPickList(this)' align='absmiddle' style='cursor:hand;cursor:pointer' title='Price Book' /> ";
+ colfour.innerHTML="<input type='text' id='txtListPrice"+count+"' name='txtListPrice"+count+"' class='txtBox' onBlur='FindDuplicate(); settotalnoofrows(); calcTotal(this)'> <img src='themes/blue/images/pricebook.gif' onClick='priceBookPickList(this)' align='absmiddle' style='cursor:hand;cursor:pointer' title='Price Book' /> ";
//Added for tax calculation
colfive.innerHTML="<input type='text' id='txtTaxTotal"+count+"' name='txtTaxTotal"+count+"' value='' class='detailedViewTextBox' style='width:65%;'><input type='hidden' id='hdnTaxTotal"+count+"' name='hdnTaxTotal"+count+"'> <input type='button' name='showTax' value=' ... ' class='classBtnSmall' onclick='fnshow_Hide(\"tax_Lay"+count+"\");'><div id='tax_Lay"+count+"' style='width:93%;position:relative;border:1px dotted #CCCCCC;display:none;background-color:#FFFFCC;top:5px;padding:5px;'><table width='100%' border='0' cellpadding='0' cellspacing='0' class='small'><tr id='vatrow"+count+"'><td align='left' width='40%' style='border:0px solid red;'><input type='text' id='txtVATTax"+count+"' name='txtVATTax"+count+"' class='txtBox' onBlur='ValidateTax(\"txtVATTax"+count+"\"); calcTotal(this);'/>% </td><td width='20%' align='right' style='border:0px solid red;'> VAT</td><td align='left' width='40%' style='border:0px solid red;'><input type='text' id='txtVATTaxTotal"+count+"' name='txtVATTaxTotal"+count+"' class='txtBox' onBlur='ValidateTax(\"txtVATTaxTotal"+count+"\"); calcTotal(this);'/></td></tr><tr id='salesrow"+count+"'><td align='left' style='border:0px solid red;'><input type='text' id='txtSalesTax"+count+"' name='txtSalesTax"+count+"' class='txtBox' onBlur='ValidateTax(\"txtSalesTax"+count+"\"); calcTotal(this);'/>% </td><td align='right' style='border:0px solid red;'> Sales</td><td align='left' style='border:0px solid red;'><input type='text' id='txtSalesTaxTotal"+count+"' name='txtSalesTaxTotal"+count+"' class='txtBox' onBlur='ValidateTax(\"txtSalesTaxTotal"+count+"\"); calcTotal(this);'/></td></tr><tr id='servicerow"+count+"'><td align='left' style='border:0px solid red;'><input type='text' id='txtServiceTax"+count+"' name='txtServiceTax"+count+"' class='txtBox' onBlur='ValidateTax(\"txtServiceTax"+count+"\"); calcTotal(this);'/>% </td><td align='right' style='border:0px solid red;'> Service</td><td align='left' style='border:0px solid red;'><input type='text' id='txtServiceTaxTotal"+count+"' name='txtServiceTaxTotal"+count+"' class='txtBox' onBlur='ValidateTax(\"txtServiceTaxTotal"+count+"\"); calcTotal(this);'/></td></tr></table></div>";
More information about the vtigercrm-commits
mailing list