[Vtigercrm-commits] [vtiger-commits] r6071 - in /vtigercrm/branches/5.0_postgresql_integration: Smarty/templates/ include/js/ include/language/ include/utils/ modules/Calendar/ modules/Calendar/language/ modules/CustomView/language/ modules/Invoice/ modules/Leads/ modules/Quotes/ modules/Users/ themes/blue/ themes/blue/images/
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Tue May 16 11:26:32 EDT 2006
Author: jeffk
Date: Tue May 16 09:26:22 2006
New Revision: 6071
Log:
refs #752. merge trunk changesets [6054] through [6069]
Added:
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/InventoryActions.tpl
- copied unchanged from r6069, vtigercrm/trunk/Smarty/templates/InventoryActions.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/InventoryCreateView.tpl
- copied unchanged from r6069, vtigercrm/trunk/Smarty/templates/InventoryCreateView.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ProductDetails.tpl
- copied unchanged from r6069, vtigercrm/trunk/Smarty/templates/ProductDetails.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ProductDetailsEditView.tpl
- copied unchanged from r6069, vtigercrm/trunk/Smarty/templates/ProductDetailsEditView.tpl
vtigercrm/branches/5.0_postgresql_integration/themes/blue/images/pointer.gif
- copied unchanged from r6069, vtigercrm/trunk/themes/blue/images/pointer.gif
Modified:
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/DetailView.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/EditViewHidden.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/salesEditView.tpl
vtigercrm/branches/5.0_postgresql_integration/include/js/general.js
vtigercrm/branches/5.0_postgresql_integration/include/language/en_us.lang.php
vtigercrm/branches/5.0_postgresql_integration/include/utils/DetailViewUtils.php
vtigercrm/branches/5.0_postgresql_integration/include/utils/EditViewUtils.php
vtigercrm/branches/5.0_postgresql_integration/include/utils/ListViewUtils.php
vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/Calendar.php
vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/CalendarCommon.php
vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/addEventUI.php
vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/calendarLayout.php
vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/language/en_us.lang.php
vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/script.js
vtigercrm/branches/5.0_postgresql_integration/modules/CustomView/language/en_us.lang.php
vtigercrm/branches/5.0_postgresql_integration/modules/Invoice/EditView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Leads/ListView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Quotes/EditView.php
vtigercrm/branches/5.0_postgresql_integration/modules/Users/Security.php
vtigercrm/branches/5.0_postgresql_integration/themes/blue/style.css
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/DetailView.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/DetailView.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/DetailView.tpl Tue May 16 09:26:22 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/branches/5.0_postgresql_integration/Smarty/templates/EditViewHidden.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/EditViewHidden.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/EditViewHidden.tpl Tue May 16 09:26:22 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/branches/5.0_postgresql_integration/Smarty/templates/salesEditView.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/salesEditView.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/salesEditView.tpl Tue May 16 09:26:22 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/branches/5.0_postgresql_integration/include/js/general.js
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/include/js/general.js (original)
+++ vtigercrm/branches/5.0_postgresql_integration/include/js/general.js Tue May 16 09:26:22 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/branches/5.0_postgresql_integration/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/include/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/include/language/en_us.lang.php Tue May 16 09:26:22 2006
@@ -863,6 +863,7 @@
//Added after 5.0 Alpha5
'Campaign Name'=>'Campaign Name',
+'LBL_ACTIONS'=>'Actions',
);
Modified: vtigercrm/branches/5.0_postgresql_integration/include/utils/DetailViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/include/utils/DetailViewUtils.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/include/utils/DetailViewUtils.php Tue May 16 09:26:22 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/branches/5.0_postgresql_integration/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/include/utils/EditViewUtils.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/include/utils/EditViewUtils.php Tue May 16 09:26:22 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/branches/5.0_postgresql_integration/include/utils/ListViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/include/utils/ListViewUtils.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/include/utils/ListViewUtils.php Tue May 16 09:26:22 2006
@@ -1981,6 +1981,7 @@
function setSessionVar($lv_array)
{
+ $start = $_REQUEST['start'];
if(isset($_REQUEST['start']) && $_REQUEST['start'] !='')
$lv_array['start']=$_REQUEST['start'];
if(isset($_REQUEST['viewname']) && $_REQUEST['viewname'] !='')
@@ -1988,6 +1989,11 @@
$_SESSION['lvs'][$_REQUEST['module']]=$lv_array;
+ if ($start < ceil ($noofrows / $list_max_entries_per_page) && $start !='')
+ {
+ $start = ceil ($noofrows / $max_ent);
+ $_SESSION['lvs'][$currentModule]['start'] = $start;
+ }
}
-
+
?>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/Calendar.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/Calendar.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/Calendar.php Tue May 16 09:26:22 2006
@@ -21,7 +21,7 @@
/*
constructor
*/
- function Calendar($view,$data)
+ function Calendar($view='',$data='')
{
$this->view = $view;
$this->date_time = new DateTime($data,true);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/CalendarCommon.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/CalendarCommon.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/CalendarCommon.php Tue May 16 09:26:22 2006
@@ -213,7 +213,7 @@
function getOtherUserName($id)
{
global $adb;
- $query="select * from users where deleted=0 and id!=".$id;
+ $query="select * from users where deleted=0 and status='Active' and id!=".$id;
$result = $adb->query($query);
$num_rows=$adb->num_rows($result);
$user_details=Array();
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/addEventUI.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/addEventUI.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/addEventUI.php Tue May 16 09:26:22 2006
@@ -1,9 +1,7 @@
<?php
require_once('include/utils/CommonUtils.php');
require_once('modules/Activities/Activity.php');
-global $calpath,$callink;
- $calpath = 'modules/Calendar/';
- $callink = 'index.php?module=Calendar&action=';
+require_once('modules/Calendar/Calendar.php');
global $theme;
$theme_path="themes/".$theme."/";
@@ -11,7 +9,89 @@
require_once ($theme_path."layout_utils.php");
global $mod_strings,$app_strings,$current_user;
$focus= new Activity();
- $userDetails=getAllUserName();
+ $calendar = new Calendar();
+ $userDetails=getOtherUserName($current_user->id);
+ function getTimeCombo()
+ {
+ global $calendar;
+ $combo = '';
+ if($calendar->hour_format == 'am/pm')
+ {
+ for($i=0; $i<48; $i++)
+ {
+ $temp = $i%2;
+ if($temp == 1)
+ {
+ $hr = ($i/2) - 0.5;
+ if($hr >= 12)
+ {
+ if($hr == 12)
+ $text = $hr.':30pm';
+ else
+ {
+ $temp_hr = $hr - 12;
+ $text = $temp_hr.':30pm';
+ }
+ }
+ else
+ $text = $hr.':30am';
+ if($hr <= 9 && strlen(trim($hr)) < 2)
+ $hr = "0".$hr;
+ $value = $hr.':30';
+ }
+ else
+ {
+ $hr = ($i/2);
+ if($hr >= 12)
+ {
+ if($hr == 12)
+ $text = $hr.':00pm';
+ else
+ {
+ $temp_hr =$hr - 12;
+ $text = $temp_hr.':00pm';
+ }
+ }
+ else
+ $text = $hr.':00am';
+ if($hr <= 9 && strlen(trim($hr)) < 2)
+ $hr = "0".$hr;
+ $value = $hr.':00';
+ }
+ $combo .= '<option value="'.$value.'" >'.$text.'</option>';
+ }
+ }
+ else
+ {
+ for($i=0;$i<48;$i++)
+ {
+ $temp = $i%2;
+ if($temp == 1)
+ {
+ $hr = ($i/2) - 0.5;
+ if($hr <= 9 && strlen(trim($hr
+ ))
+ < 2)
+ $hr = "0".$hr;
+ $value = $hr.':30';
+ }
+ else
+ {
+ $hr = ($i/2);
+ if($hr <= 9 && strlen(trim($hr
+ )) < 2)
+ $hr = "0".$hr;
+ $value = $hr.':00';
+ }
+ $text = $value;
+
+ $combo .= '<option value="'.$value.'" >'.$text.'</option>';
+ }
+ }
+ return $combo;
+
+ }
+
?>
<!-- Add Event DIV starts-->
@@ -30,12 +110,15 @@
<input type="hidden" name="record" value="">
<input type="hidden" name="taskstatus" value="Not Started">
<input type="hidden" name="duration_hours" value="0">
+ <input type="hidden" name="hrformat" value="<? echo $calendar->hour_format ?>">
<input type="hidden" name="assigned_user_id" value="<? echo $current_user->id ?>">
<input type="hidden" name="duration_minutes" value="0">
+ <input type=hidden name="inviteesid" id="inviteesid" value="">
<table border=0 cellspacing=0 cellpadding=5 width=100% class="addEventHeader">
<tr>
<td class="lvtHeaderText"><? echo $mod_strings['LBL_ADD_EVENT']?></b></td>
- <td align=right>[ <a href="#" onClick="ghide('addEvent')">Close</a> ]</td>
+ <td align=right>
+ <a href="javascript:ghide('addEvent');"><img src="<?echo $image_path?>close.gif" border="0" align="absmiddle" /></a></td>
</tr>
</table>
@@ -66,7 +149,10 @@
<table border=0 cellspacing=0 cellpadding=2 width=90%>
<tr><td colspan=3 ><b><?echo $mod_strings['LBL_EVENTSTAT']?></b></td></tr>
<tr><td>
- <input type="text" name="time_start" id="time_start" value="" class="textbox" style="width:90px"></td><td width=50%><img border=0 src="<?echo $image_path?>btnL3Clock.gif" alt="Set time.." title="Set time..">
+ <select name="time_start" id="time_start">
+ <? $combo = getTimeCombo(); echo $combo;?>
+ </select>
+ <!--input type="text" name="time_start" id="time_start" value="" class="textbox" style="width:90px"></td><td width=50%><img border=0 src="<?echo $image_path?>btnL3Clock.gif" alt="Set time.." title="Set time.."-->
</td></tr>
<tr><td>
<input type="text" name="date_start" id="jscal_field_date_start" value="" class="textbox" style="width:90px"></td><td width=50%><img border=0 src="<?echo $image_path?>btnL3Calendar.gif" alt="Set date.." title="Set date.." id="jscal_trigger_date_start">
@@ -81,7 +167,12 @@
<td width=50% valign=top >
<table border=0 cellspacing=0 cellpadding=2 width=90%>
<tr><td><b><?echo $mod_strings['LBL_EVENTEDAT']?></b></td></tr>
- <tr><td><input type="text" name="time_end" id="time_end" value="" class="textbox" style="width:90px"></td><td width=100%><img border=0 src="<?echo $image_path?>btnL3Clock.gif" alt="Set time.." title="Set time.."></td></tr>
+ <tr><td>
+ <select name="time_end" id="time_end">
+ <? $combo = getTimeCombo(); echo $combo;?>
+ </select>
+ <!--input type="text" name="time_end" id="time_end" value="" class="textbox" style="width:90px"></td><td width=100%><img border=0 src="<?echo $image_path?>btnL3Clock.gif" alt="Set time.." title="Set time.."-->
+ </td></tr>
<tr><td>
<input type="text" name="due_date" id="jscal_field_due_date" value="" class="textbox" style="width:90px"></td><td width=100%><img border=0 src="<?echo $image_path?>btnL3Calendar.gif" alt="Set date.." title="Set date.." id="jscal_trigger_due_date">
<script type="text/javascript">
@@ -130,22 +221,24 @@
<tr>
<td colspan=3>
<ul style="padding-left:20px">
- <li>To invite, select the users from the "Available Users" list and click the "Add" button.
- <li>To remove, select the users in the "Selected Users" list and the click "Remove" button.
+ <li><?echo $mod_strings['LBL_INVITE_INST1']?>
+ <li><?echo $mod_strings['LBL_INVITE_INST2']?>
</ul>
</td>
</tr>
<tr>
- <td><b>Available Users</b></td>
+ <td><b><?echo $mod_strings['LBL_AVL_USERS']?></b></td>
<td> </td>
- <td><b>Selected Users</b></td>
+ <td><b><?echo $mod_strings['LBL_SEL_USERS']?></b></td>
</tr>
<tr>
<td width=40% align=center valign=top>
- <select name="available" id="available" class=small size=5 multiple style="height:70px;width:100%">
+ <select name="availableusers" id="availableusers" class=small size=5 multiple style="height:70px;width:100%">
<?php
- for($i=1;$i<=count($userDetails);$i++){
- echo "<option>".$userDetails[$i]."</option>";
+ foreach($userDetails as $id=>$name)
+ {
+ if($id != '')
+ echo "<option value=".$id.">".$name."</option>";
}
?>
</select>
@@ -158,8 +251,7 @@
<td width=40% align=center valign=top>
<select name="selectedusers" id="selectedusers" class=small size=5 multiple style="height:70px;width:100%">
</select>
- <div align=left>
- Selected users will receive an email about the Event.
+ <div align=left><?echo $mod_strings['LBL_SELUSR_INFO']?>
</div>
</td>
@@ -177,7 +269,7 @@
<table border=0 cellspacing=0 cellpadding=2 width=100%>
<tr>
<td nowrap align=right width=20% valign=top>
- <b>Remind on : </b>
+ <b><?echo $mod_strings['LBL_RMD_ON']?> : </b>
</td>
<td width=80%>
<table border=0>
@@ -195,7 +287,7 @@
</tr>
<tr>
<td nowrap align=right>
- Send Reminder to :
+ <?echo $mod_strings['LBL_SDRMD']?> :
</td>
<td >
<input type=text class=textbox style="width:90%" value="Type Email ID..">
@@ -208,20 +300,20 @@
<table border=0 cellspacing=0 cellpadding=2 width=100%>
<tr>
<td nowrap align=right width=20% valign=top>
- <strong>Repeat :</strong>
+ <strong><?echo $mod_strings['LBL_REPEAT']?> :</strong>
</td>
<td nowrap width=80% valign=top>
<table border=0 cellspacing=0 cellpadding=0>
<tr>
<td width=20><input type="checkbox" onClick="showhide('repeatOptions')"></td>
- <td colspan=2>Enable Repeat</td>
+ <td colspan=2><?echo $mod_strings['LBL_RMD_ON']?></td>
</tr>
<tr>
<td colspan=2>
<div id="repeatOptions" style="display:none">
<table border=0 cellspacing=0 cellpadding=2>
<tr>
- <td>Repeat once in every</td>
+ <td><?echo $mod_strings['LBL_REPEAT_ONCE']?></td>
<td><input type="text" class="textbox" style="width:20px" value="2" ></td>
<td><select class=small><option onClick="ghide('repeatWeekUI');ghide('repeatMonthUI');">Day(s)</option><option onClick="gshow('repeatWeekUI');ghide('repeatMonthUI');">Week(s)</option><option onClick="gshow('repeatMonthUI');ghide('repeatWeekUI');">Month(s)</option><option onClick="ghide('repeatWeekUI');ghide('repeatMonthUI');";>Year</option></select></td>
</tr>
@@ -289,7 +381,7 @@
<tr>
<td><input type="checkbox" id="cboxRepeatEvent" name="repeatEvent" onClick="showhideRepeat('cboxRepeatEvent','repeatOptions');showhideRepeat('cboxRepeatEvent','stopRepeatOptions')"></td>
<td>Repeat this event </td>
- <td><select id="repeatOptions" style="display:none" class=small><option>Every day</option><option>Every week</option><option>Every Month</option></select></td>
+ <td><select id="repeatOptions" style="display:none" class=small><option><? echo $mod_strings['LBL_EVERYDAY']?></option><option><? echo $mod_strings['LBL_EVERYWEEK']?></option><option><? echo $mod_strings['LBL_EVERYMON']?></option></select></td>
</tr>
</table>
<table border=0 cellspacing=0 cellpadding=2 id="stopRepeatOptions" style="display:none">
@@ -316,8 +408,8 @@
<tr>
<td valign=top></td>
<td align=right>
- <input title='Save [Alt+S]' accessKey='S' type="submit" class=small style="width:90px" value="Save">
- <input type="button" class=small style="width:90px" value="Close" onClick="ghide('addEvent')">
+ <input title='Save [Alt+S]' accessKey='S' type="submit" class=small style="width:90px" value="<?echo $mod_strings['LBL_SAVE']?>">
+ <input type="button" class=small style="width:90px" value="<?echo $mod_strings['LBL_RESET']?>" onClick="ghide('addEvent')">
</td>
</tr>
</table>
@@ -326,4 +418,5 @@
<script language="JavaScript" type="text/JavaScript">
setObjects();
</script>
+
<!-- Add Activity DIV stops-->
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/calendarLayout.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/calendarLayout.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/calendarLayout.php Tue May 16 09:26:22 2006
@@ -100,8 +100,8 @@
global $mod_strings;
//echo '<pre>'; print_r($cal_arr); echo '</pre>';
$format = $cal_arr['calendar']->hour_format;
- $hour_startat = convertTime2UserSelectedFmt($format,$cal_arr['calendar']->day_start_hour);
- $hour_endat = convertTime2UserSelectedFmt($format,($cal_arr['calendar']->day_start_hour+1));
+ $hour_startat = convertTime2UserSelectedFmt($format,$cal_arr['calendar']->day_start_hour,false);
+ $hour_endat = convertTime2UserSelectedFmt($format,($cal_arr['calendar']->day_start_hour+1),false);
$headerdata = "";
$headerdata .="<table align='center' border='0' cellpadding='5' cellspacing='0' width='98%'>
<tr><td colspan='3'> </td></tr>
@@ -303,8 +303,8 @@
$sub_str = ':00';
}
$y = $i+1;
- $hour_startat = convertTime2UserSelectedFmt($format,$i);
- $hour_endat = convertTime2UserSelectedFmt($format,$y);
+ $hour_startat = convertTime2UserSelectedFmt($format,$i,false);
+ $hour_endat = convertTime2UserSelectedFmt($format,$y,false);
$dayview_layout .= '<tr>
<td style="border-right: 1px solid rgb(102, 102, 102);" align="right" width="10%">
<span class="genHeaderBig">'.$hour.'</span>
@@ -363,8 +363,8 @@
$weekview_layout .= '<table border="0" cellpadding="10" cellspacing="1" width="98%" class="calDayHour" style="background-color: #dadada">';
for($i=$day_start_hour;$i<=$day_end_hour;$i++)
{
- $hour_startat = convertTime2UserSelectedFmt($format,$i);
- $hour_endat = convertTime2UserSelectedFmt($format,($i+1));
+ $hour_startat = convertTime2UserSelectedFmt($format,$i,false);
+ $hour_endat = convertTime2UserSelectedFmt($format,($i+1),false);
$weekview_layout .= '<tr>';
for ($column=1;$column<=1;$column++)
{
@@ -422,8 +422,8 @@
$rows = 6;
}
$format = $cal['calendar']->hour_format;
- $hour_startat = convertTime2UserSelectedFmt($format,$cal['calendar']->day_start_hour);
- $hour_endat = convertTime2UserSelectedFmt($format,($cal['calendar']->day_start_hour+1));
+ $hour_startat = convertTime2UserSelectedFmt($format,$cal['calendar']->day_start_hour,false);
+ $hour_endat = convertTime2UserSelectedFmt($format,($cal['calendar']->day_start_hour+1),false);
$monthview_layout = '';
$monthview_layout .= '<br><!-- HOUR VIEW LAYER STARTS HERE -->
<div id="hrView_'.$type.'" style = "padding:5px">
@@ -723,9 +723,9 @@
echo $list_view;
}
-function convertTime2UserSelectedFmt($format,$time)
-{
- if($format == 'am/pm')
+function convertTime2UserSelectedFmt($format,$time,$format_check)
+{
+ if($format == 'am/pm' && $format_check)
{
if($time>='12')
{
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/language/en_us.lang.php Tue May 16 09:26:22 2006
@@ -186,6 +186,24 @@
'LBL_CURSTATUS'=>'Current Status',
'LBL_PENDING'=>'Pending',
'LBL_MORE'=>'More',
+'LBL_EVERYDAY'=>'Every Day',
+'LBL_EVERYWEEK'=>'Every Week',
+'LBL_EVERYMON'=>'Every Month',
+
+'LBL_INVITE_INST1'=>'To invite, select the users from the "Available Users" list and click the "Add" button.',
+'LBL_INVITE_INST2'=>'To remove, select the users in the "Selected Users" list and the click "Remove" button.',
+'LBL_SELUSR_INFO'=>' Selected users will receive an email about the Event.',
+'LBL_SEL_USERS'=>'Selected Users',
+'LBL_AVL_USERS'=>'Available Users',
+'LBL_ADD_BUTTON'=>'Add',
+'LBL_RMV_BUTTON'=>'Remove',
+'LBL_RMD_ON'=>'Remind on',
+'LBL_SDRMD'=>'Send Reminder to',
+'LBL_ENABLE_REPEAT'=>'Enable Repeat',
+'LBL_REPEAT_ONCE'=>'Repeat once in every',
+
+
+
//DON'T CONVERT THESE THEY ARE MAPPINGS
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/script.js
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/script.js (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/script.js Tue May 16 09:26:22 2006
@@ -136,6 +136,8 @@
function check_form()
{
+ formSelectColumnString('inviteesid');
+
if(document.appSave.subject.value == "")
{
alert("Missing Event Name");
@@ -161,7 +163,7 @@
var moveupLinkObj,moveupDisabledObj,movedownLinkObj,movedownDisabledObj;
function setObjects()
{
- availListObj=getObj("available")
+ availListObj=getObj("availableusers")
selectedColumnsObj=getObj("selectedusers")
}
@@ -253,14 +255,15 @@
}
}
-function formSelectColumnString()
-{
+function formSelectColumnString(usr)
+{
+ usr_id = document.getElementById(usr);
var selectedColStr = "";
for (i=0;i<selectedColumnsObj.options.length;i++)
{
selectedColStr += selectedColumnsObj.options[i].value + ";";
}
- document.SharingForm.sharedid.value = selectedColStr;
+ usr_id.value = selectedColStr;
}
function ajaxCalSaveResponse(response)
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/CustomView/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/CustomView/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/CustomView/language/en_us.lang.php Tue May 16 09:26:22 2006
@@ -215,6 +215,7 @@
'Sales Start Date'=>'Sales Start Date',
'Sales End Date'=>'Sales End Date',
'Support Start Date'=>'Support Start Date',
+'Support Expiry Date'=>'Support Expiry Date',
'Vendor Name'=>'Vendor Name',
'Mfr PartNo'=>'Mfr PartNo',
'Vendor PartNo'=>'Vendor PartNo',
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Invoice/EditView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Invoice/EditView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Invoice/EditView.php Tue May 16 09:26:22 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/branches/5.0_postgresql_integration/modules/Leads/ListView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Leads/ListView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Leads/ListView.php Tue May 16 09:26:22 2006
@@ -66,22 +66,6 @@
$_SESSION['LEADS_SORT_ORDER'] = $sorder;
//<<<<<<<<<<<<<<<<<<< sorting - stored in session >>>>>>>>>>>>>>>>>>>>
-//Storing Listvew session object
-if(!$_SESSION['lvs'][$currentModule])
-{
- unset($_SESSION['lvs']);
- $modObj = new ListViewSession();
- $modObj->sorder = $sorder;
- $modObj->sortby = $order_by;
- $_SESSION['lvs'][$currentModule] = get_object_vars($modObj);
-}
-else
-{
- setSessionVar($_SESSION['lvs'][$currentModule]);
-}
-
-$modOb = $_SESSION['lvs'][$currentModule];
-
//for change owner and change status
$change_status = get_select_options_with_id($comboFieldArray['leadstatus_dom'], $focus->lead_status);
$smarty->assign("CHANGE_STATUS",$change_status);
@@ -182,27 +166,22 @@
//Retreiving the no of rows
$noofrows = $adb->num_rows($list_result);
-//Retreiving the start value from request
-if(isset($_REQUEST['start']) && $_REQUEST['start'] != '')
-{
- $start = $_REQUEST['start'];
-
- //added to remain the navigation when sort
- //$url_string = "&start=".$_REQUEST['start'];
- $_SESSION['lvs'][$currentModule]['start'] = $_REQUEST['start'];
+//Storing Listview session object
+if(!$_SESSION['lvs'][$currentModule])
+{
+ unset($_SESSION['lvs']);
+ $modObj = new ListViewSession();
+ $modObj->sorder = $sorder;
+ $modObj->sortby = $order_by;
+ $_SESSION['lvs'][$currentModule] = get_object_vars($modObj);
}
else
{
- if ($start < ceil ($noofrows / $list_max_entries_per_page))
- {
- $start = ceil ($noofrows / $list_max_entries_per_page);
- $_SESSION['lvs'][$currentModule]['start'] = $start;
- }
- else
- {
- $start = $modOb['start'];
- }
-}
+ setSessionVar($_SESSION['lvs'][$currentModule],$noofrows,$list_max_entries_per_page);
+}
+
+$start = $_SESSION['lvs'][$currentModule]['start'];
+
//Retreive the Navigation array
$navigation_array = getNavigationValues($start, $noofrows, $list_max_entries_per_page);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Quotes/EditView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Quotes/EditView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Quotes/EditView.php Tue May 16 09:26:22 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']);
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Users/Security.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Users/Security.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Users/Security.php Tue May 16 09:26:22 2006
@@ -426,7 +426,7 @@
$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'sales_start_date','products',1,'5','sales_start_date','Sales Start Date',1,0,0,100,5,31,1,'D~O',1,null,'BAS')");
$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'sales_end_date','products',1,'5','sales_end_date','Sales End Date',1,0,0,100,6,31,1,'D~O~OTH~GE~sales_start_date~Sales Start Date',1,null,'BAS')");
$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'start_date','products',1,'5','start_date','Support Start Date',1,0,0,100,7,31,1,'D~O',1,null,'BAS')");
- $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'expiry_date','products',1,'5','expiry_date','Support Expiry Date',1,0,0,100,8,26,1,'D~O~OTH~GE~start_date~Start Date',1,null,'BAS')");
+ $this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'expiry_date','products',1,'5','expiry_date','Support Expiry Date',1,0,0,100,8,31,1,'D~O~OTH~GE~start_date~Start Date',1,null,'BAS')");
$this->db->query("insert into field values (14,".$this->db->getUniqueID("field").",'crmid','seproductsrel',1,'66','parent_id','Related To',1,0,0,100,10,31,1,'I~O',1,null,'BAS')");
Modified: vtigercrm/branches/5.0_postgresql_integration/themes/blue/style.css
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/themes/blue/style.css (original)
+++ vtigercrm/branches/5.0_postgresql_integration/themes/blue/style.css Tue May 16 09:26:22 2006
@@ -2235,3 +2235,34 @@
display:none;
}
+/* Css for quick Create */
+
+.qcWindow {
+ background-color:white;
+ border:2px solid #999999;
+}
+
+.qcHeader{
+ background:url(images/qcBg.gif) repeat-x;
+ background-color:gray;
+ color:black;
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ line-height: 19px;
+ padding-left:10px;
+}
+.qcTextBox{
+ border:1px solid #999999;
+ width:90%;
+}
+.qcTextArea{
+ border:1px solid #999999;
+ width:90%;
+ height:70px;
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 11px;
+}
+.qcTransport{
+ background-color:#ededed;
+}
+
More information about the vtigercrm-commits
mailing list