[Vtigercrm-commits] [vtiger-commits] r6058 - in /vtigercrm/trunk: Smarty/templates/ include/js/ include/language/ include/utils/ modules/Invoice/ modules/Quotes/
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Tue May 16 10:58:14 EDT 2006
Author: saraj
Date: Tue May 16 08:58:02 2006
New Revision: 6058
Log:
* Modified for Inventory Product Details handling
Modified:
vtigercrm/trunk/Smarty/templates/DetailView.tpl
vtigercrm/trunk/Smarty/templates/EditViewHidden.tpl
vtigercrm/trunk/Smarty/templates/salesEditView.tpl
vtigercrm/trunk/include/js/general.js
vtigercrm/trunk/include/language/en_us.lang.php
vtigercrm/trunk/include/utils/DetailViewUtils.php
vtigercrm/trunk/include/utils/EditViewUtils.php
vtigercrm/trunk/modules/Invoice/EditView.php
vtigercrm/trunk/modules/Quotes/EditView.php
Modified: vtigercrm/trunk/Smarty/templates/DetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailView.tpl Tue May 16 08:58:02 2006
@@ -213,9 +213,7 @@
{assign var=keycntimage value=$data.cntimage}
{if $label ne ''}
{if $keycntimage ne ''}
- {if $keyid neq 'P'}<!-- only to avoid Product Details in Inventory-->
<td class="dvtCellLabel" align=right width=25%>{$keycntimage}</td>
- {/if}
{else}
<td class="dvtCellLabel" align=right width=25%>{$label}</td>
{/if}
@@ -341,11 +339,7 @@
</div>
</td>
{else}
- {if $keyid eq 'P'}<!-- only for Product Details in Inventory-->
- {$ASSOCIATED_PRODUCTS}
- {else}
<td class="dvtCellInfo" align="left" width=25%">{$keyval}</td>
- {/if}
{/if}
{else}
<td class="dvtCellLabel" align=right></td>
@@ -362,6 +356,10 @@
{*-- End of Blocks--*}
</td>
</tr>
+ <!-- Inventory - Product Details informations -->
+ <tr>
+ {$ASSOCIATED_PRODUCTS}
+ </tr>
</table>
</td>
<td width=20% valign=top style="border-left:2px dashed #cccccc;padding:13px">
Modified: vtigercrm/trunk/Smarty/templates/EditViewHidden.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/EditViewHidden.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/EditViewHidden.tpl Tue May 16 08:58:02 2006
@@ -46,7 +46,6 @@
{elseif $MODULE eq 'PurchaseOrder' || $MODULE eq 'SalesOrder' || $MODULE eq 'Invoice' || $MODULE eq 'Quotes'}
<form name="EditView" method="POST" action="index.php">
- <input type="hidden" name="totalProductCount">
{if $MODULE eq 'Invoice' || $MODULE eq 'PurchaseOrder' || $MODULE eq 'SalesOrder'}
<input type="hidden" name="convertmode">
{/if}
Modified: vtigercrm/trunk/Smarty/templates/salesEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/salesEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/salesEditView.tpl Tue May 16 08:58:02 2006
@@ -133,109 +133,6 @@
{assign var="fldname" value="$maindata[2][0]"}
{assign var="fldvalue" value="$maindata[3][0]"}
{assign var="secondvalue" value="$maindata[3][1]"}
-
-
-
-<!-- Added to display the Product Details -->
- {if $header eq 'Product Details'}
- <tr>
- <td colspan=4>
- <table class="prdTab" border="0" cellspacing="0" cellpadding="2" id="proTab">
- <tr>
- <th width="20%"><font color='red'>*</font>Product</th>
-
- {if $MODULE eq 'Quotes' || $MODULE eq 'SalesOrder' || $MODULE eq 'Invoice'}
- <th width="12%">Qty In Stock</th>
- {/if}
-
- <th width="10%"><font color='red'>*</font>Qty</th>
- <th width="10%">Unit Price </th>
- <th width="19%"><font color='red'>*</font>List Price</th>
- <th width="10%">Total</th>
-
- <th width="5%"> </th>
- </tr>
-
- {foreach key=row_no item=data from=$ASSOCIATEDPRODUCTS.1}
- {assign var="txtProduct" value="txtProduct"|cat:$row_no}
- {assign var="qtyInStock" value="qtyInStock"|cat:$row_no}
- {assign var="txtQty" value="txtQty"|cat:$row_no}
- {assign var="unitPrice" value="unitPrice"|cat:$row_no}
- {assign var="txtListPrice" value="txtListPrice"|cat:$row_no}
- {assign var="total" value="total"|cat:$row_no}
- {assign var="hdnProductId" value="hdnProductId"|cat:$row_no}
- {assign var="hdnRowStatus" value="hdnRowStatus"|cat:$row_no}
- {assign var="hdnTotal" value="hdnTotal"|cat:$row_no}
-
- <tr id="row1" class="dvtCellLabel">
- <td nowrap><input type="text" name="{$txtProduct}" value="{$data.$txtProduct}" class="detailedViewProdTextBox" readonly /> <img src="themes/blue/images/search.gif" style="cursor: pointer;" align="absmiddle" onclick="productPickList(this)" /></td>
-
- {if $MODULE eq 'Quotes' || $MODULE eq 'SalesOrder' || $MODULE eq 'Invoice'}
- <td style="padding:3px;"><div id="{$qtyInStock}">{$data.$qtyInStock}</div> </td>
- {/if}
-
- <td><input type="text" name="{$txtQty}" value="{$data.$txtQty}" class="detailedViewTextBox" onfocus="this.className='detailedViewTextBoxOn'" onBlur="settotalnoofrows(); calcTotal(this)" /></td>
- <td style="padding:3px;"><div id="{$unitPrice}">{$data.$unitPrice}</div> </td>
- <td nowrap><input type="text" name="{$txtListPrice}" value="{$data.$txtListPrice}" class="detailedViewProdTextBox" readonly onBlur="settotalnoofrows(); calcTotal(this)"/> <img src="themes/blue/images/pricebook.gif" onclick="priceBookPickList(this)" style="cursor: pointer;" title="Price Book" align="absmiddle" /></td>
- <td style="padding:3px;"><div id="{$total}" align="right">{$data.$total}</div> </td>
- <td>
- <input type="hidden" id="{$hdnProductId}" name="{$hdnProductId}" value="{$data.$hdnProductId}">
- <input type="hidden" id="{$hdnRowStatus}" name="{$hdnRowStatus}">
- <input type="hidden" id="{$hdnTotal}" name="{$hdnTotal}" value="{$data.$hdnTotal}">
- </td>
- </tr>
- {/foreach}
- </table>
- </td>
- </tr>
- <tr>
- <td colspan=4>
- <table width="100%" border="0" cellspacing="0" cellpadding="0">
- <tr>
-
- {if $MODULE eq 'Quotes' || $MODULE eq 'SalesOrder' || $MODULE eq 'Invoice'}
- <td><input type="button" name="Button" class="small" value="Add Product" onclick="fnAddRow();" /></td>
- {else}
- <td><input type="button" name="Button" class="small" value="Add Product" onclick="fnAddRowForPO();" /></td>
- {/if}
-
- <td width="35%"> </td>
- <td style="text-align:right;padding:5px;"><b>Sub Total</b></td>
- <td style="text-align:left;padding:5px;"><input type="text" name="subTotal" value="{$SUBTOTAL}" class="detailedViewTextBox" readonly/></td>
-
- <td width="5%"> </td>
- </tr>
- <tr>
- <td> </td>
- <td> </td>
- <td style="text-align:right;padding:5px;"><b>Tax</b></td>
- <td style="text-align:left;padding:5px;"><input type="text" name="txtTax" id="txtTax" class="detailedViewTextBox" onfocus="this.className='detailedViewTextBox'" value="{$TAXVALUE}" onblur="calcGrandTotal()" /></td>
- <td> </td>
-
- </tr>
- <tr>
- <td> </td>
- <td> </td>
- <td style="text-align:right;padding:5px;"><b>Adjusment</b></td>
- <td style="text-align:left;padding:5px;"><input type="text" name="txtAdjustment" id="txtAdjustment" class="detailedViewTextBox" onfocus="this.className='detailedViewTextBox'" value="{$ADJUSTMENTVALUE}" onblur="calcGrandTotal()" /></td>
- <td> </td>
- </tr>
- <tr>
- <td> </td>
- <td> </td>
- <td style="text-align:right;padding:5px;"><b>Grand Total</b></td>
- <td style="text-align:left;padding:5px;"><input type="text" name="grandTotal" value="{$GRANDTOTAL}" class="detailedViewTextBox" readonly /></td>
- <td> </td>
- </tr>
- </table>
- <input type="hidden" name="hdnSubTotal" id="hdnSubTotal" value="{$SUBTOTAL}">
- <input type="hidden" name="hdnGrandTotal" id="hdnGrandTotal" value="{$GRANDTOTAL}">
- <input type="hidden" name="totalProductCount" id="totalProductCount" value="{$row_no}">
- </td>
- </tr>
- {/if}
-<!-- Upto this Added to display the Product Details -->
-
@@ -310,7 +207,7 @@
{/foreach}
{/foreach}
{if $check eq 0}
- {assign var=select_user value='checked'}`
+ {assign var=select_user value='checked'}
{assign var=style_user value='display:block'}
{assign var=style_group value='display:none'}
{else}
@@ -595,6 +492,16 @@
{/foreach}
<tr style="height:25px"><td> </td></tr>
{/foreach}
+
+ <!-- Added to display the Product Details in Inventory-->
+ {if $MODULE eq 'PurchaseOrder' || $MODULE eq 'SalesOrder' || $MODULE eq 'Quotes' || $MODULE eq 'Invoice'}
+ <tr>
+ <td colspan=4>
+ {include file="ProductDetailsEditView.tpl"}
+ </td>
+ </tr>
+ {/if}
+
<tr>
<td colspan=4 style="padding:5px">
<div align="center">
Modified: vtigercrm/trunk/include/js/general.js
==============================================================================
--- vtigercrm/trunk/include/js/general.js (original)
+++ vtigercrm/trunk/include/js/general.js Tue May 16 08:58:02 2006
@@ -1366,8 +1366,9 @@
rowCnt++;
var tableName = document.getElementById('proTab');
var prev = tableName.rows.length;
- var count = prev;
- var row = tableName.insertRow(prev);
+ var count = rowCnt;//prev;
+
+ var row = tableName.insertRow(prev);
row.id = "row"+count;
if(count%2)
row.className = "dvtCellLabel";
@@ -1382,9 +1383,9 @@
var colseven = row.insertCell(6);
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="<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\"; settotalnoofrows(); calcTotal(this);' /> ";
+ 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='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' 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' /> ";
colsix.innerHTML=" <div id='total"+count+"' align='right'></div><input type='hidden' id='hdnTotal"+count+"' name='hdnTotal"+count+"'>";
colseven.innerHTML="<span class='delTxt' onclick=\"deleteRow(this.parentNode.parentNode.rowIndex)\">Del</span>";
@@ -1394,7 +1395,7 @@
var tableName = document.getElementById('proTab');
var prev = tableName.rows.length;
- var count = prev;
+ var count = rowCnt;//prev;
var row = tableName.insertRow(prev);
row.id = "row"+count;
if(count%2)
@@ -1408,9 +1409,9 @@
var colfive = row.insertCell(4);
var colsix = row.insertCell(5);
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\"; settotalnoofrows(); calcTotal(this);' /> ";
+ 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='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' 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=" <div id='total"+count+"' align='right'></div><input type='hidden' id='hdnTotal"+count+"' name='hdnTotal"+count+"'>";
colsix.innerHTML="<span class='delTxt' onclick=\"deleteRow(this.parentNode.parentNode.rowIndex)\">Del</span>";
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 Tue May 16 08:58:02 2006
@@ -863,6 +863,7 @@
//Added after 5.0 Alpha5
'Campaign Name'=>'Campaign Name',
+'LBL_ACTIONS'=>'Actions',
);
Modified: vtigercrm/trunk/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/DetailViewUtils.php Tue May 16 08:58:02 2006
@@ -751,23 +751,26 @@
global $adb;
global $theme;
global $log;
+ global $app_strings;
+
$theme_path="themes/".$theme."/";
$image_path=$theme_path."images/";
$log->debug("in getDetailAssociatedProducts. Module is ".$module);
$output = '';
- $output .= '<table class="prdTab" border="0" cellspacing="0" cellpadding="0" id="proTab">';
- $output .= '<tr><th width="20%">Product</th>';
+ $output .= '<table class="prdTab" border="0" cellspacing="0" cellpadding="2" id="proTab">';
+ $output .= '<tr><td colspan="6" class="detailedViewHeader"><b>'.$app_strings['LBL_PRODUCT_DETAILS'].'</b></td></tr>';
+ $output .= '<tr><th width="20%">'.$app_strings['LBL_PRODUCT'].'</th>';
if($module == 'Quotes' || $module == 'SalesOrder' || $module == 'Invoice')
{
- $output .= '<th width="12%">Qty In Stock</th>';
- }
-
- $output .= '<th width="10%">Qty</th>';
- $output .= '<th width="10%">Unit Price </th>';
- $output .= '<th width="19%">List Price</th>';
- $output .= '<th width="10%">Total</th>';
+ $output .= '<th width="12%">'.$app_strings['LBL_QTY_IN_STOCK'].'</th>';
+ }
+
+ $output .= '<th width="10%">'.$app_strings['LBL_QTY'].'</th>';
+ $output .= '<th width="10%">'.$app_strings['LBL_UNIT_PRICE'].'</th>';
+ $output .= '<th width="19%">'.$app_strings['LBL_LIST_PRICE'].'</th>';
+ $output .= '<th width="10%">'.$app_strings['LBL_TOTAL'].'</th>';
$output .= '</tr>';
if($module == 'Quotes')
@@ -827,22 +830,22 @@
$output .= '<table width="100%" border="0" cellspacing="2" cellpadding="2" bgcolor="#FFFFFF">';
$output .= '<tr>';
$output .= '<td width="150"></td>';
- $output .= '<td><div align="right"><b>Sub Total:</b></div></td>';
+ $output .= '<td><div align="right"><b>'.$app_strings['LBL_SUB_TOTAL'].':</b></div></td>';
$output .= '<td width="150"><div align="right" style="border:1px solid #000;padding:2px"> '.$focus->column_fields['hdnSubTotal'].'</div></td>';
$output .= '</tr>';
$output .= '<tr>';
$output .= '<td> </td>';
- $output .= '<td><div align="right"><b>Tax:</b></div></td>';
+ $output .= '<td><div align="right"><b>'.$app_strings['LBL_TAX'].':</b></div></td>';
$output .= '<td width="150"><div align="right" style="border:1px solid #000;padding:2px"> '.$focus->column_fields['txtTax'].'</div></td>';
$output .= '</tr>';
$output .= '<tr>';
$output .= '<td> </td>';
- $output .= '<td><div align="right"><b>Adjustment:</b></div></td>';
+ $output .= '<td><div align="right"><b>'.$app_strings['LBL_ADJUSTMENT'].':</b></div></td>';
$output .= '<td width="150"><div align="right"><div align="right" style="border:1px solid #000;padding:2px"> '.$focus->column_fields['txtAdjustment'].'</div></td>';
$output .= '</tr>';
$output .= '<tr>';
$output .= '<td> </td>';
- $output .= '<td><div align="right"><b>Grand Total:</b></div></td>';
+ $output .= '<td><div align="right"><b>'.$app_strings['LBL_GRAND_TOTAL'].':</b></div></td>';
$output .= '<td width="150"><div id="grandTotal" align="right" style="border:1px solid #000;padding:2px"> '.$focus->column_fields['hdnGrandTotal'].'</div></td>';
$output .= '</tr>';
$output .= '</table>';
Modified: vtigercrm/trunk/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/EditViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/EditViewUtils.php Tue May 16 08:58:02 2006
@@ -1142,7 +1142,7 @@
{
$query="select products.productname,products.unit_price,products.qtyinstock,quotesproductrel.* from quotesproductrel inner join products on products.productid=quotesproductrel.productid where quoteid=".$focus->id;
}
- elseif($module == 'Orders')
+ elseif($module == 'PurchaseOrder')
{
$query="select products.productname,products.unit_price,products.qtyinstock,poproductrel.* from poproductrel inner join products on products.productid=poproductrel.productid where purchaseorderid=".$focus->id;
}
Modified: vtigercrm/trunk/modules/Invoice/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Invoice/EditView.php (original)
+++ vtigercrm/trunk/modules/Invoice/EditView.php Tue May 16 08:58:02 2006
@@ -222,8 +222,15 @@
elseif($focus->mode == 'edit')
{
$smarty->assign("UPDATEINFO",updateInfo($focus->id));
+ $num_of_products = getNoOfAssocProducts("Invoice",$focus);
+ $smarty->assign("ROWCOUNT", $num_of_products);
+ $associated_prod = getAssociatedProducts("Invoice",$focus);
+ $smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
$smarty->assign("MODE", $focus->mode);
- $se_array=getProductDetailsBlockInfo($focus->mode,"Invoice",$focus);
+ $smarty->assign("TAXVALUE", $focus->column_fields['txtTax']);
+ $smarty->assign("ADJUSTMENTVALUE", $focus->column_fields['txtAdjustment']);
+ $smarty->assign("SUBTOTAL", $focus->column_fields['hdnSubTotal']);
+ $smarty->assign("GRANDTOTAL", $focus->column_fields['hdnGrandTotal']);
}
elseif(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true')
{
@@ -251,7 +258,7 @@
$smarty->assign("CUSTOMFIELD", $cust_fld);
}
-
+$smarty->assign("ASSOCIATEDPRODUCTS",$associated_prod);
if(isset($_REQUEST['return_module'])) $smarty->assign("RETURN_MODULE", $_REQUEST['return_module']);
else $smarty->assign("RETURN_MODULE","Invoice");
Modified: vtigercrm/trunk/modules/Quotes/EditView.php
==============================================================================
--- vtigercrm/trunk/modules/Quotes/EditView.php (original)
+++ vtigercrm/trunk/modules/Quotes/EditView.php Tue May 16 08:58:02 2006
@@ -138,7 +138,7 @@
$smarty->assign("UPDATEINFO",updateInfo($focus->id));
$num_of_products = getNoOfAssocProducts($module,$focus);
$smarty->assign("ROWCOUNT", $num_of_products);
- $associated_prod = getProductDetailsBlockInfo('edit','Quotes',$focus);
+ $associated_prod = getAssociatedProducts("Quotes",$focus);//getProductDetailsBlockInfo('edit','Quotes',$focus);
$smarty->assign("ASSOCIATEDPRODUCTS", $associated_prod);
$smarty->assign("MODE", $focus->mode);
$smarty->assign("TAXVALUE", $focus->column_fields['txtTax']);
More information about the vtigercrm-commits
mailing list