[Vtigercrm-commits] [vtiger-commits] r7258 - in /vtigercrm/trunk/include/utils: DeleteUtils.php ListViewUtils.php
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Mon Jun 19 06:18:23 EDT 2006
Author: saraj
Date: Mon Jun 19 04:18:18 2006
New Revision: 7258
Log:
* Modified to handle the del link in relatedlist which has some errors
Modified:
vtigercrm/trunk/include/utils/DeleteUtils.php
vtigercrm/trunk/include/utils/ListViewUtils.php
Modified: vtigercrm/trunk/include/utils/DeleteUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/DeleteUtils.php (original)
+++ vtigercrm/trunk/include/utils/DeleteUtils.php Mon Jun 19 04:18:18 2006
@@ -11,7 +11,7 @@
/**
* This function returns no value but handles the delete functionality of each entity.
- * Input Parameter are $module - module name, $focus - module object, $record - entity id, $return_id - return entity id.
+ * Input Parameter are $module - module name, $return_module - return module name, $focus - module object, $record - entity id, $return_id - return entity id.
*/
function DeleteEntity($module,$return_module,$focus,$record,$return_id)
@@ -19,8 +19,17 @@
global $log;
$log->debug("Entering DeleteEntity(".$module.",".$return_module.",".$focus.",".$record.",".$return_id.") method ...");
global $adb;
+ global $current_user;
+
+ //if we delete the entity from relatedlist then this if will be used ie., the relationship will be deleted otherwise if we delete the entiry from listview then the relationship will not be deleted where as total entity will be deleted
+ if($module != $related_module)
+ {
switch($module):
+ case Leads:
+ $sql = 'delete from vtiger_seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
+ $adb->query($sql);
+ break;
case Accounts:
if($return_id!='')
{
@@ -28,6 +37,40 @@
$adb->query($sql);
}
break;
+ case Contacts:
+ if($return_module == 'Accounts')
+ {
+ $sql = 'update vtiger_contactdetails set accountid = "" where contactid = '.$record;
+ $adb->query($sql);
+ }
+ if($return_module == 'Potentials' && $record != '' && $return_id != '')
+ {
+ $sql = 'delete from vtiger_contpotentialrel where contactid='.$record.' and potentialid='.$return_id;
+ $adb->query($sql);
+ }
+ if($record != '' && $return_id != '')
+ {
+ $sql = 'delete from vtiger_seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
+ $adb->query($sql);
+ $sql_recentviewed ='delete from vtiger_tracker where user_id = '.$current_user->id.' and item_id = '.$record;
+ $adb->query($sql_recentviewed);
+ }
+ if($return_module == 'Products')
+ {
+ $sql = 'delete from vtiger_vendorcontactrel where contactid='.$record.' and vendorid='.$return_id;
+ $adb->query($sql);
+ }
+ break;
+ case Potentials:
+ if($return_module == 'Accounts')
+ {
+ //we can call $focus->mark_deleted($record)
+ $sql = 'update vtiger_crmentity set deleted = 1 where crmid = '.$record;
+ $adb->query($sql);
+ }
+ $sql ='delete from vtiger_seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
+ $adb->query($sql);
+ break;
case Activities:
if($return_module == 'Contacts')
{
@@ -50,30 +93,6 @@
$sql = 'delete from vtiger_recurringevents where activityid='.$record;
$adb->query($sql);
- break;
- case Contacts:
- if($return_module == 'Accounts')
- {
- $sql = 'update vtiger_crmentity set deleted = 1 where crmid = '.$record;
- $adb->query($sql);
- }
- if($return_module == 'Potentials' && $record != '' && $return_id != '')
- {
- $sql = 'delete from vtiger_contpotentialrel where contactid='.$record.' and potentialid='.$return_id;
- $adb->query($sql);
- }
- if($record != '' && $return_id != '')
- {
- $sql = 'delete from vtiger_seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
- $adb->query($sql);
- $sql_recentviewed ='delete from vtiger_tracker where user_id = '.$current_user->id.' and item_id = '.$record;
- $adb->query($sql_recentviewed);
- }
- if($return_module == 'Products')
- {
- $sql = 'delete from vtiger_vendorcontactrel where contactid='.$record.' and vendorid='.$return_id;
- $adb->query($sql);
- }
break;
case Emails:
$sql='delete from vtiger_seactivityrel where activityid='.$adb->quote($record);
@@ -94,6 +113,163 @@
$adb->query($sql);
}
break;
+ case Notes:
+ if($return_module== 'Contacts')
+ {
+ $sql = 'update vtiger_notes set contact_id = 0 where notesid = '.$record;
+ $adb->query($sql);
+ }
+ $sql = 'delete from vtiger_senotesrel where notesid = '.$record. ' and crmid = '.$return_id;
+ $adb->query($sql);
+ break;
+ case Products:
+ if($record != '' && $return_id != '')
+ {
+ if($return_module == 'Activities')
+ $sql = 'delete from vtiger_seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
+
+ if($return_module == 'Potentials' || $return_module == 'Accounts' || $return_module == 'Leads')
+ $sql = 'delete from vtiger_seproductsrel where crmid = '.$return_id.' and productid = '.$record;
+
+ $adb->query($sql);
+ }
+ if($return_module == "Contacts")
+ {
+ $sql = "UPDATE vtiger_products set contactid = '' where productid = ".$record;
+ $adb->query($sql);
+ }
+ if($return_module == "Vendors")
+ {
+ $sql = "update vtiger_products set vendor_id = '' where productid = $record";
+ $adb->query($sql);
+ }
+ break;
+ case PurchaseOrder:
+
+ if($return_module == "Vendors")
+ {
+ $sql_req ='update vtiger_crmentity set deleted = 1 where crmid= '.$record;
+ $adb->query($sql_req);
+ }
+ elseif($return_module == "Contacts")
+ {
+ $sql_req ='UPDATE vtiger_purchaseorder set contactid="" where purchaseorderid = '.$record;
+ $adb->query($sql_req);
+ }
+
+ //Following condition is commented because in Product Relatedlist we have PO which should not be deleted.
+ /*
+ elseif($return_module == "Products")
+ {
+ //Removing the relation from the po product rel
+ $po_query = "select * from vtiger_poproductrel where productid=".$return_id;
+ $result = $adb->query($po_query);
+ $num_rows = $adb->num_rows($result);
+ for($i=0; $i< $num_rows; $i++)
+ {
+ $po_id = $adb->query_result($result,$i,"purchaseorderid");
+ $qty = $adb->query_result($result,$i,"quantity");
+ $listprice = $adb->query_result($result,$i,"listprice");
+ $prod_total = $qty * $listprice;
+ //Handle here -- Tax calculations
+
+ //Get the current sub total from Quotes and update it with the new subtotal
+ updateSubTotal("PurchaseOrder","vtiger_purchaseorder","subtotal","total","purchaseorderid",$po_id,$prod_total);
+ }
+ //delete the relation from po product rel
+ $del_query = "delete from vtiger_poproductrel where productid=".$return_id." and purchaseorderid=".$record;
+ $adb->query($del_query);
+
+ }
+ */
+ break;
+ case SalesOrder:
+ if($return_module == "Accounts")
+ {
+ $focus->mark_deleted($record);
+ }
+ elseif($return_module == "Quotes")
+ {
+ $relation_query = "UPDATE vtiger_salesorder set quoteid='' where salesorderid=".$record;
+ $adb->query($relation_query);
+ }
+ elseif($return_module == "Potentials")
+ {
+ $relation_query = "UPDATE vtiger_salesorder set potentialid='' where salesorderid=".$record;
+ $adb->query($relation_query);
+ }
+ elseif($return_module == "Contacts")
+ {
+ $relation_query = "UPDATE vtiger_salesorder set contactid='' where salesorderid=".$record;
+ $adb->query($relation_query);
+ }
+ //Following condition is commented because in Product Relatedlist we have SO which should not be deleted.
+ /*
+ elseif($return_module == "Products")
+ {
+ //Removing the relation from the so product rel
+ $so_query = "select * from vtiger_soproductrel where productid=".$return_id;
+ $result = $adb->query($so_query);
+ $num_rows = $adb->num_rows($result);
+ for($i=0; $i< $num_rows; $i++)
+ {
+ $so_id = $adb->query_result($result,$i,"salesorderid");
+ $qty = $adb->query_result($result,$i,"quantity");
+ $listprice = $adb->query_result($result,$i,"listprice");
+ $prod_total = $qty * $listprice;
+ //Handle here -- Tax calculations
+
+ //Get the current sub total from Quotes and update it with the new subtotal
+ updateSubTotal("SalesOrder","vtiger_salesorder","subtotal","total","salesorderid",$so_id,$prod_total);
+ }
+ //delete the relation from so product rel
+ $del_query = "delete from vtiger_soproductrel where productid=".$return_id." and salesorderid=".$record;
+ $adb->query($del_query);
+
+ }
+ */
+ break;
+ case Quotes:
+ if($return_module == "Accounts" )
+ {
+ $focus->mark_deleted($record);
+ }
+ elseif($return_module == "Potentials")
+ {
+ $relation_query = "UPDATE vtiger_quotes set potentialid='' where quoteid=".$record;
+ $adb->query($relation_query);
+ }
+ elseif($return_module == "Contacts")
+ {
+ $relation_query = "UPDATE vtiger_quotes set contactid='' where quoteid=".$record;
+ $adb->query($relation_query);
+ }
+ //Following condition is commented because in Product Relatedlist we have Quotes which should not be deleted.
+ /*
+ elseif($return_module == "Products")
+ {
+ //Removing the relation from the vtiger_quotes product rel
+ $qt_query = "select * from vtiger_quotesproductrel where productid=".$return_id;
+ $result = $adb->query($qt_query);
+ $num_rows = $adb->num_rows($result);
+ for($i=0; $i< $num_rows; $i++)
+ {
+ $quote_id = $adb->query_result($result,$i,"quoteid");
+ $qty = $adb->query_result($result,$i,"quantity");
+ $listprice = $adb->query_result($result,$i,"listprice");
+ $prod_total = $qty * $listprice;
+ //Handle here -- Tax calculation
+
+ //Get the current sub total from Quotes and update it with the new subtotal
+ updateSubTotal("Quotes","vtiger_quotes","subtotal","total","quoteid",$quote_id,$prod_total);
+ }
+ //delete the relation from vtiger_quotes product rel
+ $del_query = "delete from vtiger_quotesproductrel where productid=".$return_id." and quoteid=".$record;
+ $adb->query($del_query);
+
+ }
+ */
+ break;
case Invoice:
if($return_module == "Accounts")
{
@@ -104,6 +280,8 @@
$relation_query = "UPDATE vtiger_invoice set salesorderid='' where invoiceid=".$record;
$adb->query($relation_query);
}
+ //Following condition is commented because in Product Relatedlist we have Invoice which should not be deleted.
+ /*
elseif($return_module=="Products")
{
//Removing the relation from the vtiger_quotes product rel
@@ -116,188 +294,38 @@
$qty = $adb->query_result($result,$i,"quantity");
$listprice = $adb->query_result($result,$i,"listprice");
$prod_total = $qty * $listprice;
+ //Handle here -- tax calculations should be handle here
//Get the current sub total from Quotes and update it with the new subtotal
- updateSubTotal("Invoices","invoice","subtotal","total","invoiceid",$invoice_id,$prod_total);
+ updateSubTotal("Invoices","vtiger_invoice","subtotal","total","invoiceid",$invoice_id,$prod_total);
}
//delete the relation from vtiger_quotes product rel
$del_query = "delete from vtiger_invoiceproductrel where productid=".$return_id." and invoiceid=".$record;
$adb->query($del_query);
}
- break;
- case Leads:
- $sql = 'delete from vtiger_seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
- $adb->query($sql);
- break;
- case Notes:
- if($return_module== 'Contacts')
- {
- $sql = 'update vtiger_notes set contact_id = 0 where notesid = '.$record;
- $adb->query($sql);
- }
- $sql = 'delete from vtiger_senotesrel where notesid = '.$record. ' and crmid = '.$return_id;
- $adb->query($sql);
-
- break;
- case Potentials:
- if($return_module == 'Accounts')
- {
- $sql = 'update vtiger_crmentity set deleted = 1 where crmid = '.$record;
- $adb->query($sql);
- }
- $sql ='delete from vtiger_seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
- $adb->query($sql);
- break;
- case Products:
- if($record != '' && $return_id != '')
- {
- if($return_module == 'Activities')
- $sql = 'delete from vtiger_seactivityrel where crmid = '.$record.' and activityid = '.$return_id;
-
- if($return_module == 'Potentials' || $return_module == 'Accounts' || $return_module == 'Leads')
- $sql = 'delete from vtiger_seproductsrel where crmid = '.$return_id.' and productid = '.$record;
-
- $adb->query($sql);
- }
- if($return_module == "Contacts")
- {
- $sql = "UPDATE vtiger_products set contactid = '' where productid = ".$record;
- $adb->query($sql);
- }
- break;
- case PurchaseOrder:
-
- if($return_module == "Accounts")
- {
- $focus->mark_deleted($record);
- }
- elseif($return_module == "Vendors")
- {
- $sql_req ='DELETE from vtiger_purchaseorder where purchaseorderid= '.$record;
- $adb->query($sql_req);
- }
- elseif($return_module == "Products")
- {
- //Removing the relation from the po product rel
- $po_query = "select * from vtiger_poproductrel where productid=".$return_id;
- $result = $adb->query($po_query);
- $num_rows = $adb->num_rows($result);
- for($i=0; $i< $num_rows; $i++)
- {
- $po_id = $adb->query_result($result,$i,"purchaseorderid");
- $qty = $adb->query_result($result,$i,"quantity");
- $listprice = $adb->query_result($result,$i,"listprice");
- $prod_total = $qty * $listprice;
- //Get the current sub total from Quotes and update it with the new subtotal
- updateSubTotal("PurchaseOrder","purchaseorder","subtotal","total","purchaseorderid",$po_id,$prod_total);
- }
- //delete the relation from po product rel
- $del_query = "delete from vtiger_poproductrel where productid=".$return_id." and purchaseorderid=".$record;
- $adb->query($del_query);
-
- }
- elseif($return_module == "Contacts")
- {
- $sql_req ='UPDATE vtiger_purchaseorder set contactid="" where purchaseorderid = '.$record;
- $adb->query($sql_req);
- }
- break;
- case Quotes:
- if($return_module == "Accounts" )
- {
- $focus->mark_deleted($record);
- }
- elseif($return_module == "Potentials")
- {
- $relation_query = "UPDATE vtiger_quotes set potentialid='' where quoteid=".$record;
- $adb->query($relation_query);
- }
- elseif($return_module == "Contacts")
- {
- $relation_query = "UPDATE vtiger_quotes set contactid='' where quoteid=".$record;
- $adb->query($relation_query);
- }
- elseif($return_module == "Products")
- {
- //Removing the relation from the vtiger_quotes product rel
- $qt_query = "select * from vtiger_quotesproductrel where productid=".$return_id;
- $result = $adb->query($qt_query);
- $num_rows = $adb->num_rows($result);
- for($i=0; $i< $num_rows; $i++)
- {
- $quote_id = $adb->query_result($result,$i,"quoteid");
- $qty = $adb->query_result($result,$i,"quantity");
- $listprice = $adb->query_result($result,$i,"listprice");
- $prod_total = $qty * $listprice;
-
- //Get the current sub total from Quotes and update it with the new subtotal
- updateSubTotal("Quotes","quotes","subtotal","total","quoteid",$quote_id,$prod_total);
- }
- //delete the relation from vtiger_quotes product rel
- $del_query = "delete from vtiger_quotesproductrel where productid=".$return_id." and quoteid=".$record;
- $adb->query($del_query);
-
- }
- case SalesOrder:
- if($return_module == "Accounts")
- {
- $focus->mark_deleted($record);
- }
- elseif($return_module == "Quotes")
- {
- $relation_query = "UPDATE vtiger_salesorder set quoteid='' where salesorderid=".$record;
- $adb->query($relation_query);
- }
- elseif($return_module == "Potentials")
- {
- $relation_query = "UPDATE vtiger_salesorder set potentialid='' where salesorderid=".$record;
- $adb->query($relation_query);
- }
- elseif($return_module == "Contacts")
- {
- $relation_query = "UPDATE vtiger_salesorder set contactid='' where salesorderid=".$record;
- $adb->query($relation_query);
- }
- elseif($return_module == "Products")
- {
- //Removing the relation from the so product rel
- $so_query = "select * from vtiger_soproductrel where productid=".$return_id;
- $result = $adb->query($so_query);
- $num_rows = $adb->num_rows($result);
- for($i=0; $i< $num_rows; $i++)
- {
- $so_id = $adb->query_result($result,$i,"salesorderid");
- $qty = $adb->query_result($result,$i,"quantity");
- $listprice = $adb->query_result($result,$i,"listprice");
- $prod_total = $qty * $listprice;
-
- //Get the current sub total from Quotes and update it with the new subtotal
- updateSubTotal("SalesOrder","salesorder","subtotal","total","salesorderid",$so_id,$prod_total);
- }
- //delete the relation from so product rel
- $del_query = "delete from vtiger_soproductrel where productid=".$return_id." and salesorderid=".$record;
- $adb->query($del_query);
-
- }
- break;
- case Rss:
- $del_query = "delete from vtiger_rss where rssid=".$record;
- $adb->query($del_query);
- break;
- case Portal:
- $del_query = "delete from vtiger_portal where portalid=".$record;
- $adb->query($del_query);
+ */
+ break;
+ case Rss:
+ $del_query = "delete from vtiger_rss where rssid=".$record;
+ $adb->query($del_query);
+ break;
+ case Portal:
+ $del_query = "delete from vtiger_portal where portalid=".$record;
+ $adb->query($del_query);
break;
endswitch;
-
+ }
+
+ //this is added to update the crmentity.deleted=1 when we delete from listview and not from relatedlist
if($return_module == $module && $return_module !='Rss' && $return_module !='Portal')
{
- global $current_user;
require_once('include/freetag/freetag.class.php');
$freetag=new freetag();
$freetag->delete_all_object_tags_for_user($current_user->id,$record);
$focus->mark_deleted($record);
}
+
+ //This is to delete the entity information from tracker ie., lastviewed
if($module != 'Faq')
{
$sql_recentviewed ='delete from vtiger_tracker where user_id = '.$current_user->id.' and item_id = '.$record;
Modified: vtigercrm/trunk/include/utils/ListViewUtils.php
==============================================================================
--- vtigercrm/trunk/include/utils/ListViewUtils.php (original)
+++ vtigercrm/trunk/include/utils/ListViewUtils.php Mon Jun 19 04:18:18 2006
@@ -741,8 +741,12 @@
$edit_link = getListViewEditLink($module,$entity_id,$relatedlist,$returnset);
$del_link = getListViewDeleteLink($module,$entity_id,$relatedlist,$returnset);
- $list_header[] = "<a href=\"$edit_link\"> ".$app_strings["LNK_EDIT"]." </a> |
- <a href=\"javascript:;\" onclick=confirmdelete(\"$del_link\")> ".$app_strings["LNK_DELETE"]." </a>";
+ $links_info = "<a href=\"$edit_link\"> ".$app_strings["LNK_EDIT"]." </a> ";
+ if($del_link != '')
+ $links_info .= " | <a href=\"javascript:;\" onclick=confirmdelete(\"$del_link\")> ".$app_strings["LNK_DELETE"]." </a>";
+
+ $list_header[] = $links_info;
+
echo '<script>
function confirmdelete(url)
{
@@ -2665,6 +2669,16 @@
*/
function getListViewDeleteLink($module,$entity_id,$relatedlist,$returnset)
{
+ $current_module = $_REQUEST['module'];
+
+ //This is added to avoid the del link in Product related list for the following modules
+ $avoid_del_links = Array("PurchaseOrder","SalesOrder","Quotes","Invoice");
+
+ if($current_module == 'Products' && in_array($module,$avoid_del_links))
+ {
+ return '';
+ }
+
$del_link = "index.php?module=$module&action=Delete&record=$entity_id";
//This is added for relatedlist listview
More information about the vtigercrm-commits
mailing list