- ";
- exit;
+ ";
+ exit;
+ }
+
}
From vtigercrm-commits at vtiger.fosslabs.com Wed Jan 3 01:37:28 2007
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 03 Jan 2007 09:37:28 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r10011 - in
/vtigercrm/branches/5.0.3/modules/Reports: ReportRun.php Reports.php
Message-ID: <20070103093728.39EDA789670@vtiger.fosslabs.com>
Author: richie
Date: Wed Jan 3 02:37:22 2007
New Revision: 10011
Log:
changes made to show activitytype in reports
Modified:
vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php
vtigercrm/branches/5.0.3/modules/Reports/Reports.php
Modified: vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php (original)
+++ vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php Wed Jan 3 02:37:22 2007
@@ -68,7 +68,7 @@
$ssql .= " where vtiger_report.reportid =".$reportid;
$ssql .= " order by vtiger_selectcolumn.columnindex";
$result = $adb->query($ssql);
-
+
$permitted_fields = Array();
while($columnslistrow = $adb->fetch_array($result))
@@ -81,6 +81,7 @@
{
list($module,$field) = split("_",$module_field);
$permitted_fields = $this->getaccesfield($module);
+
}
$selectedfields = explode(":",$fieldcolname);
@@ -128,7 +129,15 @@
$access_fields = Array();
$profileList = getCurrentUserProfileList();
- $query = "select vtiger_field.fieldname from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=(select tabid from vtiger_tab where vtiger_tab.name='".$module."') and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by block,sequence";
+ $query = "select vtiger_field.fieldname from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where";
+ if($module == "Calendar")
+ {
+ $query .= " vtiger_field.tabid in (9,16) and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by block,sequence";
+ }
+ else
+ {
+ $query .= " vtiger_field.tabid=(select tabid from vtiger_tab where vtiger_tab.name='".$module."') and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by block,sequence";
+ }
$result = $adb->query($query);
Modified: vtigercrm/branches/5.0.3/modules/Reports/Reports.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Reports/Reports.php (original)
+++ vtigercrm/branches/5.0.3/modules/Reports/Reports.php Wed Jan 3 02:37:22 2007
@@ -769,7 +769,16 @@
$access_fields = Array();
$profileList = getCurrentUserProfileList();
- $query = "select vtiger_field.fieldname from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where vtiger_field.tabid=(select tabid from vtiger_tab where vtiger_tab.name='".$module."') and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by block,sequence";
+ $query = "select vtiger_field.fieldname from vtiger_field inner join vtiger_profile2field on vtiger_profile2field.fieldid=vtiger_field.fieldid inner join vtiger_def_org_field on vtiger_def_org_field.fieldid=vtiger_field.fieldid where";
+ if($module == "Calendar")
+ {
+ $query .= " vtiger_field.tabid in (9,16) and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by block,sequence";
+ }
+ else
+ {
+ $query .= " vtiger_field.tabid=(select tabid from vtiger_tab where vtiger_tab.name='".$module."') and vtiger_field.displaytype in (1,2,4) and vtiger_profile2field.visible=0 and vtiger_def_org_field.visible=0 and vtiger_profile2field.profileid in ".$profileList." group by vtiger_field.fieldid order by block,sequence";
+ }
+
$result = $adb->query($query);
From vtigercrm-commits at vtiger.fosslabs.com Wed Jan 3 02:33:43 2007
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 03 Jan 2007 10:33:43 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r10012 - in
/vtigercrm/branches/5.0.3: Smarty/templates/ListWordTemplates.tpl index.php
Message-ID: <20070103103343.5E0B5789170@vtiger.fosslabs.com>
Author: richie
Date: Wed Jan 3 03:33:37 2007
New Revision: 10012
Log:
email template download issue - fixed
Modified:
vtigercrm/branches/5.0.3/Smarty/templates/ListWordTemplates.tpl
vtigercrm/branches/5.0.3/index.php
Modified: vtigercrm/branches/5.0.3/Smarty/templates/ListWordTemplates.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/ListWordTemplates.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/ListWordTemplates.tpl Wed Jan 3 03:33:37 2007
@@ -126,7 +126,7 @@
Modified: vtigercrm/branches/5.0.3/index.php
==============================================================================
--- vtigercrm/branches/5.0.3/index.php (original)
+++ vtigercrm/branches/5.0.3/index.php Wed Jan 3 03:33:37 2007
@@ -281,7 +281,8 @@
(ereg("^body",$action) && ereg("^Webmails",$module)) ||
(ereg("^dlAttachments",$action) && ereg("^Webmails",$module)) ||
(ereg("^DetailView",$action) && ereg("^Webmails",$module) ) ||
- ereg("^savewordtemplate",$action))
+ ereg("^savewordtemplate",$action) ||
+ ereg("^mailmergedownloadfile",$action))
{
@@ -298,10 +299,11 @@
ereg("^".$module."Ajax",$action) ||
ereg("^chat",$action) ||
ereg("^vtchat",$action) ||
- ereg("^massdelete", $action))
+ ereg("^massdelete", $action) ||
+ ereg("^mailmergedownloadfile",$action))
$skipFooters=true;
//skip footers for all these invocations as they are mostly popups
- if(ereg("^downloadfile", $action) || ereg("^fieldtypes",$action))
+ if(ereg("^downloadfile", $action) || ereg("^fieldtypes",$action) || ereg("^mailmergedownloadfile",$action))
{
$viewAttachment = true;
}
From vtigercrm-commits at vtiger.fosslabs.com Wed Jan 3 03:22:01 2007
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 03 Jan 2007 11:22:01 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r10013 - in
/vtigercrm/branches/5.0.3/modules: Accounts/ Campaigns/ Contacts/ HelpDesk/
Invoice/ Leads/ Potentials/ PurchaseOrder/ Quotes/ SalesOrder/ Vendors/
Message-ID: <20070103112202.1F47D78A6B0@vtiger.fosslabs.com>
Author: richie
Date: Wed Jan 3 04:21:46 2007
New Revision: 10013
Log:
changes made to show groupname in related list assigned to
Modified:
vtigercrm/branches/5.0.3/modules/Accounts/Accounts.php
vtigercrm/branches/5.0.3/modules/Campaigns/Campaigns.php
vtigercrm/branches/5.0.3/modules/Contacts/Contacts.php
vtigercrm/branches/5.0.3/modules/HelpDesk/HelpDesk.php
vtigercrm/branches/5.0.3/modules/Invoice/Invoice.php
vtigercrm/branches/5.0.3/modules/Leads/Leads.php
vtigercrm/branches/5.0.3/modules/Potentials/Potentials.php
vtigercrm/branches/5.0.3/modules/PurchaseOrder/PurchaseOrder.php
vtigercrm/branches/5.0.3/modules/Quotes/Quotes.php
vtigercrm/branches/5.0.3/modules/SalesOrder/SalesOrder.php
vtigercrm/branches/5.0.3/modules/Vendors/Vendors.php
Modified: vtigercrm/branches/5.0.3/modules/Accounts/Accounts.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Accounts/Accounts.php (original)
+++ vtigercrm/branches/5.0.3/modules/Accounts/Accounts.php Wed Jan 3 04:21:46 2007
@@ -158,7 +158,7 @@
$query = "SELECT vtiger_contactdetails.*,
vtiger_crmentity.crmid,
vtiger_crmentity.smownerid,
- vtiger_users.user_name
+ case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name
FROM vtiger_contactdetails
INNER JOIN vtiger_crmentity
ON vtiger_crmentity.crmid = vtiger_contactdetails.contactid
@@ -201,8 +201,7 @@
vtiger_potential.potentialname, vtiger_potential.sales_stage,
vtiger_potential.potentialtype, vtiger_potential.amount,
vtiger_potential.closingdate, vtiger_potential.potentialtype,
- vtiger_users.user_name,
- vtiger_crmentity.crmid, vtiger_crmentity.smownerid
+ case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_crmentity.crmid, vtiger_crmentity.smownerid
FROM vtiger_potential
INNER JOIN vtiger_crmentity
ON vtiger_crmentity.crmid = vtiger_potential.potentialid
@@ -247,7 +246,7 @@
vtiger_seactivityrel.*,
vtiger_crmentity.crmid, vtiger_crmentity.smownerid,
vtiger_crmentity.modifiedtime,
- vtiger_users.user_name,
+ case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,
vtiger_recurringevents.recurringtype
FROM vtiger_activity
INNER JOIN vtiger_seactivityrel
@@ -397,8 +396,7 @@
else
$returnset = '&return_module=Accounts&return_action=CallRelatedList&return_id='.$id;
- $query = "SELECT vtiger_users.user_name,
- vtiger_groups.groupname,
+ $query = "SELECT case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,
vtiger_crmentity.*,
vtiger_quotes.*,
vtiger_potential.potentialname,
@@ -445,8 +443,7 @@
else
$returnset = '&return_module=Accounts&return_action=CallRelatedList&return_id='.$id;
- $query = "SELECT vtiger_users.user_name,
- vtiger_groups.groupname,
+ $query = "SELECT case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,
vtiger_crmentity.*,
vtiger_invoice.*,
vtiger_account.accountname,
@@ -499,8 +496,7 @@
vtiger_salesorder.*,
vtiger_quotes.subject AS quotename,
vtiger_account.accountname,
- vtiger_users.user_name,
- vtiger_groups.groupname
+ case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name
FROM vtiger_salesorder
INNER JOIN vtiger_crmentity
ON vtiger_crmentity.crmid = vtiger_salesorder.salesorderid
@@ -539,7 +535,7 @@
else
$returnset = '&return_module=Accounts&return_action=CallRelatedList&return_id='.$id;
- $query = "SELECT vtiger_users.user_name, vtiger_users.id,
+ $query = "SELECT case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name, vtiger_users.id,
vtiger_troubletickets.title, vtiger_troubletickets.ticketid AS crmid,
vtiger_troubletickets.status, vtiger_troubletickets.priority,
vtiger_troubletickets.parent_id,
Modified: vtigercrm/branches/5.0.3/modules/Campaigns/Campaigns.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Campaigns/Campaigns.php (original)
+++ vtigercrm/branches/5.0.3/modules/Campaigns/Campaigns.php Wed Jan 3 04:21:46 2007
@@ -138,7 +138,7 @@
else
$returnset = '&return_module=Campaigns&return_action=CallRelatedList&return_id='.$id;
- $query = 'select vtiger_contactdetails.accountid, vtiger_users.user_name,vtiger_groups.groupname, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.title, vtiger_contactdetails.department, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_contactdetails inner join vtiger_campaigncontrel on vtiger_campaigncontrel.contactid = vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where vtiger_campaigncontrel.campaignid = '.$id.' and vtiger_crmentity.deleted=0';
+ $query = 'select vtiger_contactdetails.accountid, case when (vtiger_users.user_name not like "") then vtiger_users.user_name else vtiger_groups.groupname end as user_name , vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.title, vtiger_contactdetails.department, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_contactdetails inner join vtiger_campaigncontrel on vtiger_campaigncontrel.contactid = vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where vtiger_campaigncontrel.campaignid = '.$id.' and vtiger_crmentity.deleted=0';
$log->debug("Exiting get_contacts method ...");
return GetRelatedList('Campaigns','Contacts',$focus,$query,$button,$returnset);
@@ -163,7 +163,7 @@
else
$returnset = '&return_module=Campaigns&return_action=CallRelatedList&return_id='.$id;
- $query = 'SELECT vtiger_leaddetails.*, vtiger_crmentity.crmid, vtiger_users.user_name, vtiger_groups.groupname, vtiger_crmentity.smownerid from vtiger_leaddetails inner join vtiger_campaignleadrel on vtiger_campaignleadrel.leadid=vtiger_leaddetails.leadid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_leaddetails.leadid left join vtiger_users on vtiger_crmentity.smownerid = vtiger_users.id left join vtiger_leadgrouprelation on vtiger_leaddetails.leadid=vtiger_leadgrouprelation.leadid left join vtiger_groups on vtiger_groups.groupname=vtiger_leadgrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_campaignleadrel.campaignid = '.$id;
+ $query = 'SELECT vtiger_leaddetails.*, vtiger_crmentity.crmid,vtiger_leadaddress.phone,vtiger_leadsubdetails.website, case when (vtiger_users.user_name not like "") then vtiger_users.user_name else vtiger_groups.groupname end as user_name, vtiger_crmentity.smownerid from vtiger_leaddetails inner join vtiger_campaignleadrel on vtiger_campaignleadrel.leadid=vtiger_leaddetails.leadid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_leaddetails.leadid inner join vtiger_leadsubdetails on vtiger_leadsubdetails.leadsubscriptionid = vtiger_leaddetails.leadid inner join vtiger_leadaddress on vtiger_leadaddress.leadaddressid = vtiger_leadsubdetails.leadsubscriptionid left join vtiger_users on vtiger_crmentity.smownerid = vtiger_users.id left join vtiger_leadgrouprelation on vtiger_leaddetails.leadid=vtiger_leadgrouprelation.leadid left join vtiger_groups on vtiger_groups.groupname=vtiger_leadgrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_campaignleadrel.campaignid = '.$id;
$log->debug("Exiting get_leads method ...");
return GetRelatedList('Campaigns','Leads',$focus,$query,$button,$returnset);
}
@@ -187,7 +187,7 @@
else
$returnset = '&return_module=Campaigns&return_action=CallRelatedList&return_id='.$id;
- $query = 'select vtiger_users.user_name,vtiger_groups.groupname, vtiger_potential.accountid, vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_potential.potentialtype, vtiger_potential.sales_stage, vtiger_potential.amount, vtiger_potential.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid from vtiger_campaign inner join vtiger_potential on vtiger_campaign.campaignid = vtiger_potential.campaignid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_potential.potentialid left join vtiger_potentialgrouprelation on vtiger_potential.potentialid=vtiger_potentialgrouprelation.potentialid left join vtiger_groups on vtiger_groups.groupname=vtiger_potentialgrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_campaign.campaignid = '.$id.' and vtiger_crmentity.deleted=0';
+ $query = 'select case when (vtiger_users.user_name not like "") then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_potential.accountid, vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_potential.potentialtype, vtiger_potential.sales_stage, vtiger_potential.amount, vtiger_potential.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid from vtiger_campaign inner join vtiger_potential on vtiger_campaign.campaignid = vtiger_potential.campaignid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_potential.potentialid left join vtiger_potentialgrouprelation on vtiger_potential.potentialid=vtiger_potentialgrouprelation.potentialid left join vtiger_groups on vtiger_groups.groupname=vtiger_potentialgrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_campaign.campaignid = '.$id.' and vtiger_crmentity.deleted=0';
if($this->column_fields['account_id'] != 0)
$log->debug("Exiting get_opportunities method ...");
return GetRelatedList('Campaigns','Potentials',$focus,$query,$button,$returnset);
@@ -223,7 +223,7 @@
vtiger_seactivityrel.*,
vtiger_crmentity.crmid, vtiger_crmentity.smownerid,
vtiger_crmentity.modifiedtime,
- vtiger_users.user_name,
+ case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,
vtiger_recurringevents.recurringtype
FROM vtiger_activity
INNER JOIN vtiger_seactivityrel
Modified: vtigercrm/branches/5.0.3/modules/Contacts/Contacts.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Contacts/Contacts.php (original)
+++ vtigercrm/branches/5.0.3/modules/Contacts/Contacts.php Wed Jan 3 04:21:46 2007
@@ -349,7 +349,7 @@
$log->info("Potential Related List for Contact Displayed");
// First, get the list of IDs.
- $query = 'select vtiger_users.user_name,vtiger_groups.groupname,vtiger_contactdetails.accountid, vtiger_contactdetails.contactid , vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_potential.potentialtype, vtiger_potential.sales_stage, vtiger_potential.amount, vtiger_potential.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid from vtiger_contactdetails inner join vtiger_potential on vtiger_contactdetails.accountid = vtiger_potential.accountid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_potential.potentialid left join vtiger_potentialgrouprelation on vtiger_potential.potentialid=vtiger_potentialgrouprelation.potentialid left join vtiger_groups on vtiger_groups.groupname=vtiger_potentialgrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_contactdetails.contactid = '.$id.' and vtiger_crmentity.deleted=0';
+ $query = 'select case when (vtiger_users.user_name not like "") then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_contactdetails.accountid, vtiger_contactdetails.contactid , vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_potential.potentialtype, vtiger_potential.sales_stage, vtiger_potential.amount, vtiger_potential.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid from vtiger_contactdetails inner join vtiger_potential on vtiger_contactdetails.accountid = vtiger_potential.accountid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_potential.potentialid left join vtiger_potentialgrouprelation on vtiger_potential.potentialid=vtiger_potentialgrouprelation.potentialid left join vtiger_groups on vtiger_groups.groupname=vtiger_potentialgrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_contactdetails.contactid = '.$id.' and vtiger_crmentity.deleted=0';
if($this->column_fields['account_id'] != 0)
$log->debug("Exiting get_opportunities method ...");
return GetRelatedList('Contacts','Potentials',$focus,$query,$button,$returnset);
@@ -383,7 +383,7 @@
$log->info("Activity Related List for Contact Displayed");
- $query = "SELECT vtiger_users.user_name,vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_activity.activityid , vtiger_activity.subject, vtiger_activity.activitytype, vtiger_activity.date_start, vtiger_activity.due_date, vtiger_cntactivityrel.contactid, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_recurringevents.recurringtype from vtiger_contactdetails inner join vtiger_cntactivityrel on vtiger_cntactivityrel.contactid = vtiger_contactdetails.contactid inner join vtiger_activity on vtiger_cntactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_cntactivityrel.activityid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_contactdetails.contactid=".$id." and vtiger_crmentity.deleted = 0 and (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task') AND ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Completed' ) and ( vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Held') "; //recurring type is added in Query -Jaguar
+ $query = "SELECT case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_activity.activityid , vtiger_activity.subject, vtiger_activity.activitytype, vtiger_activity.date_start, vtiger_activity.due_date, vtiger_cntactivityrel.contactid, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_recurringevents.recurringtype from vtiger_contactdetails inner join vtiger_cntactivityrel on vtiger_cntactivityrel.contactid = vtiger_contactdetails.contactid inner join vtiger_activity on vtiger_cntactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_cntactivityrel.activityid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_contactdetails.contactid=".$id." and vtiger_crmentity.deleted = 0 and (vtiger_activity.activitytype = 'Meeting' or vtiger_activity.activitytype='Call' or vtiger_activity.activitytype='Task') AND ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Completed' ) and ( vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Held') "; //recurring type is added in Query -Jaguar
$log->debug("Exiting get_activities method ...");
return GetRelatedList('Contacts','Calendar',$focus,$query,$button,$returnset);
@@ -434,7 +434,7 @@
else
$returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id;
- $query = "select vtiger_users.user_name,vtiger_crmentity.crmid, vtiger_troubletickets.title, vtiger_contactdetails.contactid, vtiger_troubletickets.parent_id, vtiger_contactdetails.firstname, vtiger_contactdetails.lastname, vtiger_troubletickets.status, vtiger_troubletickets.priority, vtiger_crmentity.smownerid from vtiger_troubletickets inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_troubletickets.ticketid left join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_troubletickets.parent_id left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_ticketgrouprelation on vtiger_troubletickets.ticketid=vtiger_ticketgrouprelation.ticketid left join vtiger_groups on vtiger_groups.groupname=vtiger_ticketgrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_contactdetails.contactid=".$id;
+ $query = "select case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_crmentity.crmid, vtiger_troubletickets.title, vtiger_contactdetails.contactid, vtiger_troubletickets.parent_id, vtiger_contactdetails.firstname, vtiger_contactdetails.lastname, vtiger_troubletickets.status, vtiger_troubletickets.priority, vtiger_crmentity.smownerid from vtiger_troubletickets inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_troubletickets.ticketid left join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_troubletickets.parent_id left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_ticketgrouprelation on vtiger_troubletickets.ticketid=vtiger_ticketgrouprelation.ticketid left join vtiger_groups on vtiger_groups.groupname=vtiger_ticketgrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_contactdetails.contactid=".$id;
$log->info("Ticket Related List for Contact Displayed");
$log->debug("Exiting get_tickets method ...");
return GetRelatedList('Contacts','HelpDesk',$focus,$query,$button,$returnset);
@@ -497,7 +497,7 @@
$returnset = '&return_module=Contacts&return_action=DetailView&return_id='.$id;
else
$returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id;
- $query = "select vtiger_users.user_name,vtiger_crmentity.*, vtiger_quotes.*,vtiger_potential.potentialname,vtiger_contactdetails.lastname from vtiger_quotes inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_quotes.quoteid left outer join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_quotes.contactid left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_quotes.potentialid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_quotegrouprelation on vtiger_quotes.quoteid=vtiger_quotegrouprelation.quoteid left join vtiger_groups on vtiger_groups.groupname=vtiger_quotegrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_contactdetails.contactid=".$id;
+ $query = "select case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_crmentity.*, vtiger_quotes.*,vtiger_potential.potentialname,vtiger_contactdetails.lastname from vtiger_quotes inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_quotes.quoteid left outer join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_quotes.contactid left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_quotes.potentialid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_quotegrouprelation on vtiger_quotes.quoteid=vtiger_quotegrouprelation.quoteid left join vtiger_groups on vtiger_groups.groupname=vtiger_quotegrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_contactdetails.contactid=".$id;
$log->debug("Exiting get_quotes method ...");
return GetRelatedList('Contacts','Quotes',$focus,$query,$button,$returnset);
}
@@ -525,7 +525,7 @@
else
$returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id;
- $query = "select vtiger_users.user_name,vtiger_crmentity.*, vtiger_salesorder.*, vtiger_quotes.subject as quotename, vtiger_account.accountname, vtiger_contactdetails.lastname from vtiger_salesorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid left outer join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_salesorder.contactid left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid=vtiger_sogrouprelation.salesorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_salesorder.contactid = ".$id;
+ $query = "select case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_crmentity.*, vtiger_salesorder.*, vtiger_quotes.subject as quotename, vtiger_account.accountname, vtiger_contactdetails.lastname from vtiger_salesorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid left outer join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_salesorder.contactid left join vtiger_sogrouprelation on vtiger_salesorder.salesorderid=vtiger_sogrouprelation.salesorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_sogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_salesorder.contactid = ".$id;
$log->debug("Exiting get_salesorder method ...");
return GetRelatedList('Contacts','SalesOrder',$focus,$query,$button,$returnset);
}
@@ -583,7 +583,7 @@
else
$returnset = '&return_module=Contacts&return_action=CallRelatedList&return_id='.$id;
- $query = "select vtiger_users.user_name,vtiger_crmentity.*, vtiger_purchaseorder.*,vtiger_vendor.vendorname,vtiger_contactdetails.lastname from vtiger_purchaseorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_purchaseorder.purchaseorderid left outer join vtiger_vendor on vtiger_purchaseorder.vendorid=vtiger_vendor.vendorid left outer join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_purchaseorder.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_pogrouprelation on vtiger_purchaseorder.purchaseorderid=vtiger_pogrouprelation.purchaseorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_pogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_purchaseorder.contactid=".$id;
+ $query = "select case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_crmentity.*, vtiger_purchaseorder.*,vtiger_vendor.vendorname,vtiger_contactdetails.lastname from vtiger_purchaseorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_purchaseorder.purchaseorderid left outer join vtiger_vendor on vtiger_purchaseorder.vendorid=vtiger_vendor.vendorid left outer join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_purchaseorder.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_pogrouprelation on vtiger_purchaseorder.purchaseorderid=vtiger_pogrouprelation.purchaseorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_pogrouprelation.groupname where vtiger_crmentity.deleted=0 and vtiger_purchaseorder.contactid=".$id;
$log->debug("Exiting get_purchase_orders method ...");
return GetRelatedList('Contacts','PurchaseOrder',$focus,$query,$button,$returnset);
}
@@ -614,7 +614,7 @@
$log->info("Email Related List for Contact Displayed");
- $query = "select vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.activitytype, vtiger_users.user_name, vtiger_crmentity.modifiedtime, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_activity.date_start from vtiger_activity, vtiger_seactivityrel, vtiger_contactdetails, vtiger_users, vtiger_crmentity left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.activityid = vtiger_activity.activityid and vtiger_contactdetails.contactid = vtiger_seactivityrel.crmid and vtiger_users.id=vtiger_crmentity.smownerid and vtiger_crmentity.crmid = vtiger_activity.activityid and vtiger_contactdetails.contactid = ".$id." and vtiger_activity.activitytype='Emails' and vtiger_crmentity.deleted = 0";
+ $query = "select case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_activity.activityid, vtiger_activity.subject, vtiger_activity.activitytype, vtiger_crmentity.modifiedtime, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_activity.date_start from vtiger_activity, vtiger_seactivityrel, vtiger_contactdetails, vtiger_users, vtiger_crmentity left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.activityid = vtiger_activity.activityid and vtiger_contactdetails.contactid = vtiger_seactivityrel.crmid and vtiger_users.id=vtiger_crmentity.smownerid and vtiger_crmentity.crmid = vtiger_activity.activityid and vtiger_contactdetails.contactid = ".$id." and vtiger_activity.activitytype='Emails' and vtiger_crmentity.deleted = 0";
$log->debug("Exiting get_emails method ...");
return GetRelatedList('Contacts','Emails',$focus,$query,$button,$returnset);
}
@@ -638,7 +638,7 @@
$button = '';
$log->info("Campaign Related List for Contact Displayed");
- $query = "SELECT vtiger_users.user_name, vtiger_campaign.campaignid, vtiger_campaign.campaignname, vtiger_campaign.campaigntype, vtiger_campaign.campaignstatus, vtiger_campaign.expectedrevenue, vtiger_campaign.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_campaign inner join vtiger_campaigncontrel on vtiger_campaigncontrel.campaignid=vtiger_campaign.campaignid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_campaign.campaignid left join vtiger_campaigngrouprelation on vtiger_campaign.campaignid=vtiger_campaigngrouprelation.campaignid left join vtiger_groups on vtiger_groups.groupname=vtiger_campaigngrouprelation.groupname left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid where vtiger_campaigncontrel.contactid=".$id." and vtiger_crmentity.deleted=0";
+ $query = "SELECT case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name, vtiger_campaign.campaignid, vtiger_campaign.campaignname, vtiger_campaign.campaigntype, vtiger_campaign.campaignstatus, vtiger_campaign.expectedrevenue, vtiger_campaign.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_campaign inner join vtiger_campaigncontrel on vtiger_campaigncontrel.campaignid=vtiger_campaign.campaignid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_campaign.campaignid left join vtiger_campaigngrouprelation on vtiger_campaign.campaignid=vtiger_campaigngrouprelation.campaignid left join vtiger_groups on vtiger_groups.groupname=vtiger_campaigngrouprelation.groupname left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid where vtiger_campaigncontrel.contactid=".$id." and vtiger_crmentity.deleted=0";
$log->debug("Exiting get_campaigns method ...");
return GetRelatedList('Contacts','Campaigns',$focus,$query,$button,$returnset);
Modified: vtigercrm/branches/5.0.3/modules/HelpDesk/HelpDesk.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/HelpDesk/HelpDesk.php (original)
+++ vtigercrm/branches/5.0.3/modules/HelpDesk/HelpDesk.php Wed Jan 3 04:21:46 2007
@@ -220,7 +220,7 @@
else
$returnset = '&return_module=HelpDesk&return_action=CallRelatedList&return_id='.$id;
- $query = "SELECT vtiger_activity.*, vtiger_crmentity.crmid, vtiger_recurringevents.recurringtype, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') AND ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Completed' ) and ( vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Held')";
+ $query = "SELECT case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_activity.*, vtiger_crmentity.crmid, vtiger_recurringevents.recurringtype, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') AND ( vtiger_activity.status is NULL OR vtiger_activity.status != 'Completed' ) and ( vtiger_activity.eventstatus is NULL OR vtiger_activity.eventstatus != 'Held')";
$log->debug("Exiting get_activities method ...");
return GetRelatedList('HelpDesk','Calendar',$focus,$query,$button,$returnset);
Modified: vtigercrm/branches/5.0.3/modules/Invoice/Invoice.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Invoice/Invoice.php (original)
+++ vtigercrm/branches/5.0.3/modules/Invoice/Invoice.php Wed Jan 3 04:21:46 2007
@@ -181,7 +181,7 @@
else
$returnset = '&return_module=Invoice&return_action=CallRelatedList&return_id='.$id;
- $query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and activitytype='Task' and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred')";
+ $query = "SELECT case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and activitytype='Task' and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred')";
$log->debug("Exiting get_activities method ...");
return GetRelatedList('Invoice','Calendar',$focus,$query,$button,$returnset);
}
Modified: vtigercrm/branches/5.0.3/modules/Leads/Leads.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Leads/Leads.php (original)
+++ vtigercrm/branches/5.0.3/modules/Leads/Leads.php Wed Jan 3 04:21:46 2007
@@ -220,7 +220,7 @@
// First, get the list of IDs.
- $query = "SELECT vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name,vtiger_recurringevents.recurringtype from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and ((vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus !='' && vtiger_activity.eventstatus != 'Held'))";
+ $query = "SELECT vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime,case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_recurringevents.recurringtype from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and ((vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus !='' && vtiger_activity.eventstatus != 'Held'))";
$log->debug("Exiting get_activities method ...");
return GetRelatedList('Leads','Calendar',$focus,$query,$button,$returnset);
}
@@ -243,7 +243,7 @@
$returnset = '&return_module=Leads&return_action=CallRelatedList&return_id='.$id;
$log->info("Campaign Related List for Lead Displayed");
- $query = "SELECT vtiger_users.user_name, vtiger_campaign.campaignid, vtiger_campaign.campaignname, vtiger_campaign.campaigntype, vtiger_campaign.campaignstatus, vtiger_campaign.expectedrevenue, vtiger_campaign.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_campaign inner join vtiger_campaignleadrel on vtiger_campaignleadrel.campaignid=vtiger_campaign.campaignid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_campaign.campaignid left join vtiger_campaigngrouprelation on vtiger_campaign.campaignid=vtiger_campaigngrouprelation.campaignid left join vtiger_groups on vtiger_groups.groupname=vtiger_campaigngrouprelation.groupname left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid where vtiger_campaignleadrel.leadid=".$id." and vtiger_crmentity.deleted=0";
+ $query = "SELECT case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name ,vtiger_campaign.campaignid, vtiger_campaign.campaignname, vtiger_campaign.campaigntype, vtiger_campaign.campaignstatus, vtiger_campaign.expectedrevenue, vtiger_campaign.closingdate, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_campaign inner join vtiger_campaignleadrel on vtiger_campaignleadrel.campaignid=vtiger_campaign.campaignid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_campaign.campaignid left join vtiger_campaigngrouprelation on vtiger_campaign.campaignid=vtiger_campaigngrouprelation.campaignid left join vtiger_groups on vtiger_groups.groupname=vtiger_campaigngrouprelation.groupname left join vtiger_users on vtiger_users.id = vtiger_crmentity.smownerid where vtiger_campaignleadrel.leadid=".$id." and vtiger_crmentity.deleted=0";
$log->debug("Exiting get_campaigns method ...");
return GetRelatedList('Leads','Campaigns',$focus,$query,$button,$returnset);
Modified: vtigercrm/branches/5.0.3/modules/Potentials/Potentials.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Potentials/Potentials.php (original)
+++ vtigercrm/branches/5.0.3/modules/Potentials/Potentials.php Wed Jan 3 04:21:46 2007
@@ -92,6 +92,7 @@
var $default_order_by = 'potentialname';
var $default_sort_order = 'ASC';
+ var $groupTable = Array('vtiger_potentialgrouprelation','potentialid');
function Potentials() {
$this->log = LoggerManager::getLogger('potential');
$this->db = new PearDatabase();
@@ -246,7 +247,7 @@
else
$returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id;
- $query = 'select vtiger_contactdetails.accountid, vtiger_users.user_name,vtiger_groups.groupname,vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.title, vtiger_contactdetails.department, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_potential inner join vtiger_contpotentialrel on vtiger_contpotentialrel.potentialid = vtiger_potential.potentialid inner join vtiger_contactdetails on vtiger_contpotentialrel.contactid = vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where vtiger_potential.potentialid = '.$id.' and vtiger_crmentity.deleted=0';
+ $query = 'select case when (vtiger_users.user_name not like "") then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_contactdetails.accountid,vtiger_potential.potentialid, vtiger_potential.potentialname, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.title, vtiger_contactdetails.department, vtiger_contactdetails.email, vtiger_contactdetails.phone, vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_potential inner join vtiger_contpotentialrel on vtiger_contpotentialrel.potentialid = vtiger_potential.potentialid inner join vtiger_contactdetails on vtiger_contpotentialrel.contactid = vtiger_contactdetails.contactid inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_crmentity.smownerid=vtiger_users.id where vtiger_potential.potentialid = '.$id.' and vtiger_crmentity.deleted=0';
$log->debug("Exiting get_contacts method ...");
return GetRelatedList('Potentials','Contacts',$focus,$query,$button,$returnset);
@@ -278,7 +279,7 @@
else
$returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id;
- $query = "SELECT vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name, vtiger_recurringevents.recurringtype from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid inner join vtiger_potential on vtiger_potential.potentialid=vtiger_seactivityrel.crmid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and vtiger_crmentity.deleted=0 and ((vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus != '' && vtiger_activity.eventstatus != 'Held'))";
+ $query = "SELECT vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name, vtiger_recurringevents.recurringtype from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid inner join vtiger_potential on vtiger_potential.potentialid=vtiger_seactivityrel.crmid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid where vtiger_seactivityrel.crmid=".$id." and (activitytype='Task' or activitytype='Call' or activitytype='Meeting') and vtiger_crmentity.deleted=0 and ((vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') or (vtiger_activity.eventstatus != '' && vtiger_activity.eventstatus != 'Held'))";
$log->debug("Exiting get_activities method ...");
return GetRelatedList('Potentials','Calendar',$focus,$query,$button,$returnset);
@@ -462,7 +463,7 @@
$returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id;
- $query = "select vtiger_crmentity.*, vtiger_quotes.*, vtiger_potential.potentialname, vtiger_users.user_name from vtiger_quotes inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_quotes.quoteid left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_quotes.potentialid left join vtiger_quotegrouprelation on vtiger_quotes.quoteid=vtiger_quotegrouprelation.quoteid left join vtiger_groups on vtiger_groups.groupname=vtiger_quotegrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 and vtiger_potential.potentialid=".$id;
+ $query = "select case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name, vtiger_crmentity.*, vtiger_quotes.*, vtiger_potential.potentialname from vtiger_quotes inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_quotes.quoteid left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_quotes.potentialid left join vtiger_quotegrouprelation on vtiger_quotes.quoteid=vtiger_quotegrouprelation.quoteid left join vtiger_groups on vtiger_groups.groupname=vtiger_quotegrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 and vtiger_potential.potentialid=".$id;
$log->debug("Exiting get_quotes method ...");
return GetRelatedList('Potentials','Quotes',$focus,$query,$button,$returnset);
}
@@ -494,7 +495,7 @@
$returnset = '&return_module=Potentials&return_action=CallRelatedList&return_id='.$id;
- $query = "select vtiger_crmentity.*, vtiger_salesorder.*, vtiger_quotes.subject as quotename, vtiger_account.accountname, vtiger_potential.potentialname,vtiger_users.user_name
+ $query = "select vtiger_crmentity.*, vtiger_salesorder.*, vtiger_quotes.subject as quotename, vtiger_account.accountname, vtiger_potential.potentialname,case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name
from vtiger_salesorder
inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid
left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid
Modified: vtigercrm/branches/5.0.3/modules/PurchaseOrder/PurchaseOrder.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/PurchaseOrder/PurchaseOrder.php (original)
+++ vtigercrm/branches/5.0.3/modules/PurchaseOrder/PurchaseOrder.php Wed Jan 3 04:21:46 2007
@@ -159,7 +159,7 @@
else
$returnset = '&return_module=PurchaseOrder&return_action=CallRelatedList&return_id='.$id;
- $query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid,vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and activitytype='Task' and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') ";
+ $query = "SELECT case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid,vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and activitytype='Task' and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred') ";
$log->debug("Exiting get_activities method ...");
return GetRelatedList('PurchaseOrder','Calendar',$focus,$query,$button,$returnset);
}
Modified: vtigercrm/branches/5.0.3/modules/Quotes/Quotes.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Quotes/Quotes.php (original)
+++ vtigercrm/branches/5.0.3/modules/Quotes/Quotes.php Wed Jan 3 04:21:46 2007
@@ -168,7 +168,7 @@
else
$returnset = '&return_module=Quotes&return_action=CallRelatedList&return_id='.$id;
- $query = "select vtiger_crmentity.*, vtiger_salesorder.*, vtiger_quotes.subject as quotename, vtiger_account.accountname,vtiger_users.user_name
+ $query = "select vtiger_crmentity.*, vtiger_salesorder.*, vtiger_quotes.subject as quotename, vtiger_account.accountname,case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name
from vtiger_salesorder
inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_salesorder.salesorderid
left outer join vtiger_quotes on vtiger_quotes.quoteid=vtiger_salesorder.quoteid
@@ -200,7 +200,7 @@
else
$returnset = '&return_module=Quotes&return_action=CallRelatedList&return_id='.$id;
- $query = "SELECT vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name,vtiger_recurringevents.recurringtype from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and activitytype='Task' and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred')";
+ $query = "SELECT case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name, vtiger_contactdetails.contactid, vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime,vtiger_recurringevents.recurringtype from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left outer join vtiger_recurringevents on vtiger_recurringevents.activityid=vtiger_activity.activityid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and activitytype='Task' and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Deferred')";
$log->debug("Exiting get_activities method ...");
return GetRelatedList('Quotes','Calendar',$focus,$query,$button,$returnset);
}
Modified: vtigercrm/branches/5.0.3/modules/SalesOrder/SalesOrder.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/SalesOrder/SalesOrder.php (original)
+++ vtigercrm/branches/5.0.3/modules/SalesOrder/SalesOrder.php Wed Jan 3 04:21:46 2007
@@ -176,7 +176,7 @@
else
$returnset = '&return_module=SalesOrder&return_action=CallRelatedList&return_id='.$id;
- $query = "SELECT vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime, vtiger_users.user_name from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and activitytype='Task' and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status !='Deferred')";
+ $query = "SELECT case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_contactdetails.lastname, vtiger_contactdetails.firstname, vtiger_contactdetails.contactid, vtiger_activity.*,vtiger_seactivityrel.*,vtiger_crmentity.crmid, vtiger_crmentity.smownerid, vtiger_crmentity.modifiedtime from vtiger_activity inner join vtiger_seactivityrel on vtiger_seactivityrel.activityid=vtiger_activity.activityid inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_activity.activityid left join vtiger_cntactivityrel on vtiger_cntactivityrel.activityid= vtiger_activity.activityid left join vtiger_contactdetails on vtiger_contactdetails.contactid = vtiger_cntactivityrel.contactid left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid left join vtiger_activitygrouprelation on vtiger_activitygrouprelation.activityid=vtiger_crmentity.crmid left join vtiger_groups on vtiger_groups.groupname=vtiger_activitygrouprelation.groupname where vtiger_seactivityrel.crmid=".$id." and activitytype='Task' and vtiger_crmentity.deleted=0 and (vtiger_activity.status is not NULL && vtiger_activity.status != 'Completed') and (vtiger_activity.status is not NULL && vtiger_activity.status !='Deferred')";
$log->debug("Exiting get_activities method ...");
return GetRelatedList('SalesOrder','Calendar',$focus,$query,$button,$returnset);
}
@@ -267,7 +267,7 @@
else
$returnset = '&return_module=SalesOrder&return_action=CallRelatedList&return_id='.$id;
- $query = "select vtiger_crmentity.*, vtiger_invoice.*, vtiger_account.accountname, vtiger_salesorder.subject as salessubject, vtiger_users.user_name
+ $query = "select vtiger_crmentity.*, vtiger_invoice.*, vtiger_account.accountname, vtiger_salesorder.subject as salessubject, case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name
from vtiger_invoice
inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_invoice.invoiceid
left outer join vtiger_account on vtiger_account.accountid=vtiger_invoice.accountid
Modified: vtigercrm/branches/5.0.3/modules/Vendors/Vendors.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Vendors/Vendors.php (original)
+++ vtigercrm/branches/5.0.3/modules/Vendors/Vendors.php Wed Jan 3 04:21:46 2007
@@ -113,7 +113,7 @@
else
$returnset = '&return_module=Vendors&return_action=CallRelatedList&return_id='.$id;
- $query = "select vtiger_users.user_name,vtiger_groups.groupname,vtiger_crmentity.*, vtiger_purchaseorder.*,vtiger_vendor.vendorname from vtiger_purchaseorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_purchaseorder.purchaseorderid left outer join vtiger_vendor on vtiger_purchaseorder.vendorid=vtiger_vendor.vendorid left join vtiger_pogrouprelation on vtiger_purchaseorder.purchaseorderid=vtiger_pogrouprelation.purchaseorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_pogrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 and vtiger_purchaseorder.vendorid=".$id;
+ $query = "select case when (vtiger_users.user_name not like '') then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_crmentity.*, vtiger_purchaseorder.*,vtiger_vendor.vendorname from vtiger_purchaseorder inner join vtiger_crmentity on vtiger_crmentity.crmid=vtiger_purchaseorder.purchaseorderid left outer join vtiger_vendor on vtiger_purchaseorder.vendorid=vtiger_vendor.vendorid left join vtiger_pogrouprelation on vtiger_purchaseorder.purchaseorderid=vtiger_pogrouprelation.purchaseorderid left join vtiger_groups on vtiger_groups.groupname=vtiger_pogrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 and vtiger_purchaseorder.vendorid=".$id;
$log->debug("Exiting get_purchase_orders method ...");
return GetRelatedList('Vendors','PurchaseOrder',$focus,$query,$button,$returnset);
}
@@ -136,7 +136,7 @@
else
$returnset = '&return_module=Vendors&return_action=CallRelatedList&return_id='.$id;
- $query = 'SELECT vtiger_users.user_name,vtiger_groups.groupname,vtiger_contactdetails.*, vtiger_crmentity.crmid, vtiger_crmentity.smownerid,vtiger_vendorcontactrel.vendorid from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid inner join vtiger_vendorcontactrel on vtiger_vendorcontactrel.contactid=vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 and vtiger_vendorcontactrel.vendorid = '.$id;
+ $query = 'SELECT case when (vtiger_users.user_name not like "") then vtiger_users.user_name else vtiger_groups.groupname end as user_name,vtiger_contactdetails.*, vtiger_crmentity.crmid, vtiger_crmentity.smownerid,vtiger_vendorcontactrel.vendorid from vtiger_contactdetails inner join vtiger_crmentity on vtiger_crmentity.crmid = vtiger_contactdetails.contactid inner join vtiger_vendorcontactrel on vtiger_vendorcontactrel.contactid=vtiger_contactdetails.contactid left join vtiger_contactgrouprelation on vtiger_contactdetails.contactid=vtiger_contactgrouprelation.contactid left join vtiger_groups on vtiger_groups.groupname=vtiger_contactgrouprelation.groupname left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 and vtiger_vendorcontactrel.vendorid = '.$id;
$log->debug("Exiting get_contacts method ...");
return GetRelatedList('Vendors','Contacts',$focus,$query,$button,$returnset);
From vtigercrm-commits at vtiger.fosslabs.com Wed Jan 3 05:06:18 2007
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 03 Jan 2007 13:06:18 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r10014 -
/vtigercrm/branches/5.0.3/modules/Settings/saveemailtemplate.php
Message-ID: <20070103130618.E3E9878A6B5@vtiger.fosslabs.com>
Author: richie
Date: Wed Jan 3 06:06:13 2007
New Revision: 10014
Log:
allow single quotes during email template creation
Modified:
vtigercrm/branches/5.0.3/modules/Settings/saveemailtemplate.php
Modified: vtigercrm/branches/5.0.3/modules/Settings/saveemailtemplate.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/saveemailtemplate.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/saveemailtemplate.php Wed Jan 3 06:06:13 2007
@@ -15,13 +15,13 @@
$db = new PearDatabase();
$log->debug("the foldername is ".$folderName);
$folderName = $_REQUEST["foldername"];
-$templateName = $_REQUEST["templatename"];
+$templateName = addslashes($_REQUEST["templatename"]);
$log->debug("the templatename is ".$templateName);
$templateid = $_REQUEST["templateid"];
$log->debug("the templateid is ".$templateid);
$description = $_REQUEST["description"];
$log->debug("the description is ".$description);
-$subject = $_REQUEST["subject"];
+$subject = addslashes($_REQUEST["subject"]);
$log->debug("the subject is ".$subject);
$body = $_REQUEST["body"];
$log->debug("the body is ".$body);
From vtigercrm-commits at vtiger.fosslabs.com Wed Jan 3 05:34:45 2007
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 03 Jan 2007 13:34:45 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r10015 -
/vtigercrm/branches/5.0.3/include/js/general.js
Message-ID: <20070103133445.EF96B78A6D0@vtiger.fosslabs.com>
Author: richie
Date: Wed Jan 3 06:34:41 2007
New Revision: 10015
Log:
duplicate account check function added
Modified:
vtigercrm/branches/5.0.3/include/js/general.js
Modified: vtigercrm/branches/5.0.3/include/js/general.js
==============================================================================
--- vtigercrm/branches/5.0.3/include/js/general.js (original)
+++ vtigercrm/branches/5.0.3/include/js/general.js Wed Jan 3 06:34:41 2007
@@ -1716,6 +1716,31 @@
Calendar.setup ({
inputField : fieldid, ifFormat : dateformat, showsTime : false, button : imageid, singleClick : true, step : 1
});
+}
+
+//Added to check duplicate account creation
+
+function AjaxDuplicateValidate(module,fieldname,oform)
+{
+ var fieldvalue = getObj(fieldname).value;
+ var url = "module="+module+"&action="+module+"Ajax&file=Save&"+fieldname+"="+fieldvalue+"&dup_check=true"
+ new Ajax.Request(
+ 'index.php',
+ {queue: {position: 'end', scope: 'command'},
+ method: 'post',
+ postBody:url,
+ onComplete: function(response) {
+ var str = response.responseText
+ if(str.indexOf('SUCCESS') > -1)
+ {
+ oform.submit();
+ }else
+ {
+ alert(str);
+ }
+ }
+ }
+ );
}
/**to get SelectContacts Popup
From vtigercrm-commits at vtiger.fosslabs.com Wed Jan 3 06:15:39 2007
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 03 Jan 2007 14:15:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r10016 - in
/vtigercrm/branches/5.0.3/modules: Settings/SaveRole.php
Users/SaveProfile.php
Message-ID: <20070103141539.B582F78A6D6@vtiger.fosslabs.com>
Author: richie
Date: Wed Jan 3 07:15:33 2007
New Revision: 10016
Log:
allowed quotes during role and profile creation
Modified:
vtigercrm/branches/5.0.3/modules/Settings/SaveRole.php
vtigercrm/branches/5.0.3/modules/Users/SaveProfile.php
Modified: vtigercrm/branches/5.0.3/modules/Settings/SaveRole.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/SaveRole.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/SaveRole.php Wed Jan 3 07:15:33 2007
@@ -11,7 +11,7 @@
require_once('include/database/PearDatabase.php');
global $adb;
-$rolename = $_REQUEST['roleName'];
+$rolename = addslashes($_REQUEST['roleName']);
$mode = $_REQUEST['mode'];
if(isset($_REQUEST['dup_check']) && $_REQUEST['dup_check']!='')
{
Modified: vtigercrm/branches/5.0.3/modules/Users/SaveProfile.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/SaveProfile.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/SaveProfile.php Wed Jan 3 07:15:33 2007
@@ -13,7 +13,7 @@
require_once('include/utils/UserInfoUtil.php');
require_once('include/utils/utils.php');
global $adb;
-$profilename = $_REQUEST['profile_name'];
+$profilename = addslashes($_REQUEST['profile_name']);
$description= $_REQUEST['profile_description'];
$def_module = $_REQUEST['selected_module'];
$def_tab = $_REQUEST['selected_tab'];
From vtigercrm-commits at vtiger.fosslabs.com Wed Jan 3 06:45:55 2007
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 03 Jan 2007 14:45:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r10017 -
/vtigercrm/branches/5.0.3/Smarty/templates/UserDetailView.tpl
Message-ID: <20070103144555.DB44778A6D6@vtiger.fosslabs.com>
Author: richie
Date: Wed Jan 3 07:45:51 2007
New Revision: 10017
Log:
view audit trial issue fixed
Modified:
vtigercrm/branches/5.0.3/Smarty/templates/UserDetailView.tpl
Modified: vtigercrm/branches/5.0.3/Smarty/templates/UserDetailView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/UserDetailView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/UserDetailView.tpl Wed Jan 3 07:45:51 2007
@@ -310,7 +310,7 @@
function showAuditTrail()
{
var userid = document.getElementById('userid').value;
- window.open("index.php?module=Users&action=UsersAjax&file=ShowAuditTrail&userid="+userid,"","width=650,height=800,resizable=0,scrollbars=1,left=100");
+ window.open("index.php?module=Settings&action=SettingsAjax&file=ShowAuditTrail&userid="+userid,"","width=650,height=800,resizable=0,scrollbars=1,left=100");
}
function deleteUser(userid)
From vtigercrm-commits at vtiger.fosslabs.com Wed Jan 3 07:13:06 2007
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 03 Jan 2007 15:13:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r10018 -
/vtigercrm/branches/5.0.3/Smarty/templates/CreateView.tpl
Message-ID: <20070103151306.E187A78A6E0@vtiger.fosslabs.com>
Author: richie
Date: Wed Jan 3 08:13:03 2007
New Revision: 10018
Log:
Account duplicate check added for save buttons
Modified:
vtigercrm/branches/5.0.3/Smarty/templates/CreateView.tpl
Modified: vtigercrm/branches/5.0.3/Smarty/templates/CreateView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/CreateView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/CreateView.tpl Wed Jan 3 08:13:03 2007
@@ -161,7 +161,11 @@
{/if}
+ {if $MODULE eq 'Accounts'}
+
+ {else}
+ {/if}
@@ -195,7 +199,11 @@
+ {if $MODULE eq 'Accounts'}
+
+ {else}
+ {/if}
From vtigercrm-commits at vtiger.fosslabs.com Wed Jan 3 07:35:06 2007
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 03 Jan 2007 15:35:06 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r10019 -
/vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php
Message-ID: <20070103153506.8376178A6E0@vtiger.fosslabs.com>
Author: richie
Date: Wed Jan 3 08:35:02 2007
New Revision: 10019
Log:
added firstname with lastname in helpdesk reports related to field
Modified:
vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php
Modified: vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php (original)
+++ vtigercrm/branches/5.0.3/modules/Reports/ReportRun.php Wed Jan 3 08:35:02 2007
@@ -159,7 +159,7 @@
{
if($this->primarymodule == "HelpDesk" && $selectedfields[0] == "vtiger_crmentityRelHelpDesk")
{
- $querycolumn = "case vtiger_crmentityRelHelpDesk.setype when 'Accounts' then vtiger_accountRelHelpDesk.accountname when 'Contacts' then vtiger_contactdetailsRelHelpDesk.lastname End"." '".$selectedfields[2]."', vtiger_crmentityRelHelpDesk.setype 'Entity_type'";
+ $querycolumn = "case vtiger_crmentityRelHelpDesk.setype when 'Accounts' then vtiger_accountRelHelpDesk.accountname when 'Contacts' then concat(vtiger_contactdetailsRelHelpDesk.lastname,' ',vtiger_contactdetailsRelHelpDesk.firstname) End"." '".$selectedfields[2]."', vtiger_crmentityRelHelpDesk.setype 'Entity_type'";
return $querycolumn;
}
if($this->primarymodule == "Products" || $this->secondarymodule == "Products")
From vtigercrm-commits at vtiger.fosslabs.com Wed Jan 3 07:53:36 2007
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Wed, 03 Jan 2007 15:53:36 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r10020 -
/vtigercrm/branches/5.0.3/modules/HelpDesk/Save.php
Message-ID: <20070103155336.336B178AB4C@vtiger.fosslabs.com>
Author: richie
Date: Wed Jan 3 08:53:32 2007
New Revision: 10020
Log:
Code contribution by john added for customfield trouble tickets.Fixes #2593
Modified:
vtigercrm/branches/5.0.3/modules/HelpDesk/Save.php
Modified: vtigercrm/branches/5.0.3/modules/HelpDesk/Save.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/HelpDesk/Save.php (original)
+++ vtigercrm/branches/5.0.3/modules/HelpDesk/Save.php Wed Jan 3 08:53:32 2007
@@ -140,11 +140,25 @@
$desc .= '
Modified: vtigercrm/branches/5.0.3/include/js/Inventory.js
==============================================================================
--- vtigercrm/branches/5.0.3/include/js/Inventory.js (original)
+++ vtigercrm/branches/5.0.3/include/js/Inventory.js Wed Jan 10 06:18:49 2007
@@ -294,12 +294,15 @@
var max_row_count = document.getElementById('proTab').rows.length;
max_row_count = eval(max_row_count)-2;//As the table has two header rows, we will reduce two from row length
+ var duplicate = false, iposition = '', positions = '', duplicate_products = '';
+
var product_id = new Array(max_row_count-1);
var product_name = new Array(max_row_count-1);
product_id[1] = getObj("hdnProductId"+1).value;
product_name[1] = getObj("productName"+1).value;
for (var i=1;i<=max_row_count;i++)
{
+ iposition = ""+i;
for(var j=i+1;j<=max_row_count;j++)
{
if(i == 1)
@@ -308,10 +311,20 @@
}
if(product_id[i] == product_id[j] && product_id[i] != '')
{
- alert("You have selected < "+getObj("productName"+j).value+" > more than once in line items "+i+" & "+j+".\n It is advisable to select the product just once but change the Qty. Thank You");
- //return false;
+ if(!duplicate) positions = iposition;
+ duplicate = true;
+ if(positions.search(j) == -1) positions = positions+" & "+j;
+
+ if(duplicate_products.search(getObj("productName"+j).value) == -1)
+ duplicate_products = duplicate_products+getObj("productName"+j).value+" \n";
}
}
+ }
+ if(duplicate)
+ {
+ //alert("You have selected < "+duplicate_products+" > more than once in line items "+positions+".\n It is advisable to select the product just once but change the Qty. Thank You");
+ if(!confirm("You have selected the following product(s) more than once. \n"+duplicate_products+"\n Do you want to Continue?"))
+ return false;
}
return true;
}
@@ -493,7 +506,7 @@
//Quantity
colfour.className = "crmTableRow small"
- colfour.innerHTML='';
+ colfour.innerHTML='';
//List Price with Discount, Total after Discount and Tax labels
colfive.className = "crmTableRow small"
From vtigercrm-commits at vtiger.fosslabs.com Thu Jan 11 09:39:17 2007
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 11 Jan 2007 17:39:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r10035 - in
/vtigercrm/branches/5.0.3: Smarty/templates/ include/utils/
modules/Accounts/ modules/Contacts/ modules/Leads/ modules/Potentials/
modules/Products/ modules/Users/ modules/Vendors/ schema/
Message-ID: <20070111173918.2E9D078B0FC@vtiger.fosslabs.com>
Author: richie
Date: Thu Jan 11 10:38:54 2007
New Revision: 10035
Log:
* Revamped the Product - Lead/Account/Potential and Contact relationship. Now Product can be relate with n number of Leads/Accounts/Contact/Potentials and vice versa
Added:
vtigercrm/branches/5.0.3/modules/Accounts/updateRelations.php
Modified:
vtigercrm/branches/5.0.3/Smarty/templates/Popup.tpl
vtigercrm/branches/5.0.3/Smarty/templates/RelatedListContents.tpl
vtigercrm/branches/5.0.3/include/utils/DeleteUtils.php
vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php
vtigercrm/branches/5.0.3/modules/Contacts/Contacts.php
vtigercrm/branches/5.0.3/modules/Contacts/updateRelations.php
vtigercrm/branches/5.0.3/modules/Leads/updateRelations.php
vtigercrm/branches/5.0.3/modules/Potentials/updateRelations.php
vtigercrm/branches/5.0.3/modules/Products/Products.php
vtigercrm/branches/5.0.3/modules/Products/updateRelations.php
vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php
vtigercrm/branches/5.0.3/modules/Vendors/updateRelations.php
vtigercrm/branches/5.0.3/schema/DatabaseSchema.xml
Modified: vtigercrm/branches/5.0.3/Smarty/templates/Popup.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Popup.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Popup.tpl Thu Jan 11 10:38:54 2007
@@ -18,7 +18,7 @@
Modified: vtigercrm/branches/5.0.3/Smarty/templates/RelatedListContents.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/RelatedListContents.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/RelatedListContents.tpl Thu Jan 11 10:38:54 2007
@@ -31,7 +31,11 @@
{/if}
From vtigercrm-commits at vtiger.fosslabs.com Thu Jan 11 09:53:21 2007
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 11 Jan 2007 17:53:21 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r10037 - in
/vtigercrm/branches/5.0.3/modules/Migration: ./ DBChanges/ language/
Message-ID: <20070111175321.4F02F78B0FC@vtiger.fosslabs.com>
Author: richie
Date: Thu Jan 11 10:53:08 2007
New Revision: 10037
Log:
* Totally changed the file structure to run the migration for patches also
Added:
vtigercrm/branches/5.0.3/modules/Migration/DBChanges/
vtigercrm/branches/5.0.3/modules/Migration/DBChanges/42P2_to_50.php (with props)
vtigercrm/branches/5.0.3/modules/Migration/DBChanges/501_to_502.php (with props)
vtigercrm/branches/5.0.3/modules/Migration/DBChanges/502_to_503.php
vtigercrm/branches/5.0.3/modules/Migration/MigrationInfo.php (with props)
vtigercrm/branches/5.0.3/modules/Migration/PatchApply.php
vtigercrm/branches/5.0.3/modules/Migration/deleteCustomFields.php (with props)
vtigercrm/branches/5.0.3/modules/Migration/index.php
vtigercrm/branches/5.0.3/modules/Migration/rename_tables.php (with props)
vtigercrm/branches/5.0.3/modules/Migration/versions.php
Modified:
vtigercrm/branches/5.0.3/modules/Migration/Migration.php
vtigercrm/branches/5.0.3/modules/Migration/language/en_us.lang.php
Modified: vtigercrm/branches/5.0.3/modules/Migration/Migration.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Migration/Migration.php (original)
+++ vtigercrm/branches/5.0.3/modules/Migration/Migration.php Thu Jan 11 10:53:08 2007
@@ -299,8 +299,8 @@
//To handle the file includes for each and every version
//Here we have to decide which files should be included, where the files will be added newly for every public release
- //Handle Here -- Mickie
- include("modules/Migration/ModifyDatabase/MigrationInfo.php");
+ //In this included file we have included modules/Migration/DBChanges/42P2_to_50.php which will apply the db changes upto 5.0.
+ include("modules/Migration/MigrationInfo.php");
$migrationlog->debug("Mickie ---- Ends\n\n\n");
}
Modified: vtigercrm/branches/5.0.3/modules/Migration/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Migration/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Migration/language/en_us.lang.php Thu Jan 11 10:53:08 2007
@@ -75,6 +75,8 @@
'LBL_MYSQL_SERVER_PATH'=>'MySQL Server Path : ',
'LBL_MIGRATE_BUTTON'=>'Migrate',
'LBL_CANCEL_BUTTON'=>'Cancel',
+'LBL_UPGRADE_FROM_VTIGER_5X'=>'Upgrade database from vtiger CRM 5.x to next version',
+'LBL_PATCH_OR_MIGRATION'=>'you must specify the source database version (Patch update or Migration)',
);
From vtigercrm-commits at vtiger.fosslabs.com Thu Jan 11 09:55:55 2007
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Thu, 11 Jan 2007 17:55:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r10038 - in
/vtigercrm/branches/5.0.3/Smarty/templates: Migration.tpl SetMenu.tpl
Settings.tpl
Message-ID: <20070111175555.0199578B124@vtiger.fosslabs.com>
Author: richie
Date: Thu Jan 11 10:55:50 2007
New Revision: 10038
Log:
* Totally changed the file structure to run the migration for patches also
Added:
vtigercrm/branches/5.0.3/Smarty/templates/Migration.tpl
Modified:
vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl
vtigercrm/branches/5.0.3/Smarty/templates/Settings.tpl
Modified: vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl Thu Jan 11 10:55:50 2007
@@ -173,7 +173,7 @@
From vtigercrm-commits at vtiger.fosslabs.com Sat Jan 13 03:46:09 2007
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 13 Jan 2007 11:46:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r10054 - in
/vtigercrm/branches/5.0.3: include/utils/EditViewUtils.php
modules/Invoice/CreatePDF.php modules/PurchaseOrder/CreatePDF.php
modules/Quotes/CreatePDF.php modules/SalesOrder/CreateSOPDF.php
Message-ID: <20070113114609.37C1078B194@vtiger.fosslabs.com>
Author: richie
Date: Sat Jan 13 04:46:00 2007
New Revision: 10054
Log:
* Added call to from_html for description and terms&conditions fields which are not displayed correctly in pdf whey they have ampersand(&) and single quote and double quote, Fixes #2809
Modified:
vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php
vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php
vtigercrm/branches/5.0.3/modules/PurchaseOrder/CreatePDF.php
vtigercrm/branches/5.0.3/modules/Quotes/CreatePDF.php
vtigercrm/branches/5.0.3/modules/SalesOrder/CreateSOPDF.php
Modified: vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php Sat Jan 13 04:46:00 2007
@@ -1450,7 +1450,7 @@
$product_Detail[$i]['hdnProductId'.$i] = $hdnProductId;
$product_Detail[$i]['productName'.$i]= from_html($productname);
- $product_Detail[$i]['productDescription'.$i]= $productdescription;
+ $product_Detail[$i]['productDescription'.$i]= from_html($productdescription);
$product_Detail[$i]['comment'.$i]= $comment;
if($module != 'PurchaseOrder' && $focus->object_name != 'Order')
Modified: vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php (original)
+++ vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php Sat Jan 13 04:46:00 2007
@@ -55,8 +55,8 @@
$ship_code = $focus->column_fields["ship_code"];
$ship_country = $focus->column_fields["ship_country"];
-$conditions = $focus->column_fields["terms_conditions"];
-$description = $focus->column_fields["description"];
+$conditions = from_html($focus->column_fields["terms_conditions"]);
+$description = from_html($focus->column_fields["description"]);
$status = $focus->column_fields["invoicestatus"];
// Company information
Modified: vtigercrm/branches/5.0.3/modules/PurchaseOrder/CreatePDF.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/PurchaseOrder/CreatePDF.php (original)
+++ vtigercrm/branches/5.0.3/modules/PurchaseOrder/CreatePDF.php Sat Jan 13 04:46:00 2007
@@ -53,8 +53,8 @@
$ship_code = $focus->column_fields["ship_code"];
$ship_country = $focus->column_fields["ship_country"];
-$conditions = $focus->column_fields["terms_conditions"];
-$description = $focus->column_fields["description"];
+$conditions = from_html($focus->column_fields["terms_conditions"]);
+$description = from_html($focus->column_fields["description"]);
$status = $focus->column_fields["postatus"];
// Company information
Modified: vtigercrm/branches/5.0.3/modules/Quotes/CreatePDF.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Quotes/CreatePDF.php (original)
+++ vtigercrm/branches/5.0.3/modules/Quotes/CreatePDF.php Sat Jan 13 04:46:00 2007
@@ -53,8 +53,8 @@
$ship_code = $focus->column_fields["ship_code"];
$ship_country = $focus->column_fields["ship_country"];
-$conditions = $focus->column_fields["terms_conditions"];
-$description = $focus->column_fields["description"];
+$conditions = from_html($focus->column_fields["terms_conditions"]);
+$description = from_html($focus->column_fields["description"]);
$status = $focus->column_fields["quotestage"];
// Company information
Modified: vtigercrm/branches/5.0.3/modules/SalesOrder/CreateSOPDF.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/SalesOrder/CreateSOPDF.php (original)
+++ vtigercrm/branches/5.0.3/modules/SalesOrder/CreateSOPDF.php Sat Jan 13 04:46:00 2007
@@ -53,8 +53,8 @@
$ship_code = $focus->column_fields["ship_code"];
$ship_country = $focus->column_fields["ship_country"];
-$conditions = $focus->column_fields["terms_conditions"];
-$description = $focus->column_fields["description"];
+$conditions = from_html($focus->column_fields["terms_conditions"]);
+$description = from_html($focus->column_fields["description"]);
$status = $focus->column_fields["sostatus"];
// Company information
From vtigercrm-commits at vtiger.fosslabs.com Sat Jan 13 04:56:22 2007
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Sat, 13 Jan 2007 12:56:22 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r10055 - in
/vtigercrm/branches/5.0.3: Smarty/templates/ include/js/ modules/Contacts/
modules/Emails/ modules/Leads/
Message-ID: <20070113125622.4EACC7895F3@vtiger.fosslabs.com>
Author: richie
Date: Sat Jan 13 05:56:11 2007
New Revision: 10055
Log:
Email validation in detail view and related list
Modified:
vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl
vtigercrm/branches/5.0.3/Smarty/templates/RelatedListContents.tpl
vtigercrm/branches/5.0.3/Smarty/templates/SelectEmail.tpl
vtigercrm/branches/5.0.3/include/js/general.js
vtigercrm/branches/5.0.3/modules/Contacts/CallRelatedList.php
vtigercrm/branches/5.0.3/modules/Emails/mailSelect.php
vtigercrm/branches/5.0.3/modules/Leads/CallRelatedList.php
vtigercrm/branches/5.0.3/modules/Leads/DetailView.php
Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl Sat Jan 13 05:56:11 2007
@@ -27,7 +27,6 @@
+
+
+
+
+
+
+
+
+
From vtigercrm-commits at vtiger.fosslabs.com Tue Jan 16 01:42:39 2007
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 16 Jan 2007 09:42:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r10065 -
/vtigercrm/branches/5.0.3/modules/Migration/PatchApply.php
Message-ID: <20070116094239.D94AD78B44D@vtiger.fosslabs.com>
Author: richie
Date: Tue Jan 16 02:42:34 2007
New Revision: 10065
Log:
* Added code to update the version in table
Modified:
vtigercrm/branches/5.0.3/modules/Migration/PatchApply.php
Modified: vtigercrm/branches/5.0.3/modules/Migration/PatchApply.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Migration/PatchApply.php (original)
+++ vtigercrm/branches/5.0.3/modules/Migration/PatchApply.php Tue Jan 16 02:42:34 2007
@@ -85,6 +85,8 @@
//HANDLE HERE - Mickie
//Here we have to update the version in table. so that when we do migration next time we will get the version
+global $adb, $vtiger_current_version;
+$adb->query("update vtiger_version set old_version='".$versions[$source_version]."',current_version='".$vtiger_current_version."'");
From vtigercrm-commits at vtiger.fosslabs.com Tue Jan 16 01:44:40 2007
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 16 Jan 2007 09:44:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r10066 -
/vtigercrm/branches/5.0.3/modules/Users/add2db.php
Message-ID: <20070116094440.C796D78B1C9@vtiger.fosslabs.com>
Author: richie
Date: Tue Jan 16 02:44:34 2007
New Revision: 10066
Log:
file moved to settings
Removed:
vtigercrm/branches/5.0.3/modules/Users/add2db.php
From vtigercrm-commits at vtiger.fosslabs.com Tue Jan 16 02:36:19 2007
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits@vtiger.fosslabs.com)
Date: Tue, 16 Jan 2007 10:36:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r10067 - in
/vtigercrm/branches/5.0.3: Smarty/templates/Header.tpl
include/js/general.js
Message-ID: <20070116103619.81B14789B58@vtiger.fosslabs.com>
Author: richie
Date: Tue Jan 16 03:36:14 2007
New Revision: 10067
Log:
validation error fixed
Modified:
vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl
vtigercrm/branches/5.0.3/include/js/general.js
Modified: vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl Tue Jan 16 03:36:14 2007
@@ -145,6 +145,7 @@
";
echo '';
echo "
";
- echo "
vtiger CRM 5.0.3 | Visit www.vtiger.com for more information
";
+ echo "
vtiger CRM 5.0.3-rc2 | Visit www.vtiger.com for more information
Modified: vtigercrm/branches/5.0.3/include/js/Inventory.js
==============================================================================
--- vtigercrm/branches/5.0.3/include/js/Inventory.js (original)
+++ vtigercrm/branches/5.0.3/include/js/Inventory.js Wed Jan 10 06:18:49 2007
@@ -294,12 +294,15 @@
var max_row_count = document.getElementById('proTab').rows.length;
max_row_count = eval(max_row_count)-2;//As the table has two header rows, we will reduce two from row length
+ var duplicate = false, iposition = '', positions = '', duplicate_products = '';
+
var product_id = new Array(max_row_count-1);
var product_name = new Array(max_row_count-1);
product_id[1] = getObj("hdnProductId"+1).value;
product_name[1] = getObj("productName"+1).value;
for (var i=1;i<=max_row_count;i++)
{
+ iposition = ""+i;
for(var j=i+1;j<=max_row_count;j++)
{
if(i == 1)
@@ -308,10 +311,20 @@
}
if(product_id[i] == product_id[j] && product_id[i] != '')
{
- alert("You have selected < "+getObj("productName"+j).value+" > more than once in line items "+i+" & "+j+".\n It is advisable to select the product just once but change the Qty. Thank You");
- //return false;
+ if(!duplicate) positions = iposition;
+ duplicate = true;
+ if(positions.search(j) == -1) positions = positions+" & "+j;
+
+ if(duplicate_products.search(getObj("productName"+j).value) == -1)
+ duplicate_products = duplicate_products+getObj("productName"+j).value+" \n";
}
}
+ }
+ if(duplicate)
+ {
+ //alert("You have selected < "+duplicate_products+" > more than once in line items "+positions+".\n It is advisable to select the product just once but change the Qty. Thank You");
+ if(!confirm("You have selected the following product(s) more than once. \n"+duplicate_products+"\n Do you want to Continue?"))
+ return false;
}
return true;
}
@@ -493,7 +506,7 @@
//Quantity
colfour.className = "crmTableRow small"
- colfour.innerHTML='';
+ colfour.innerHTML='';
//List Price with Discount, Total after Discount and Tax labels
colfive.className = "crmTableRow small"
From vtigercrm-commits at vtiger.fosslabs.com Thu Jan 11 12:39:17 2007
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 11 Jan 2007 17:39:17 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r10035 - in
/vtigercrm/branches/5.0.3: Smarty/templates/ include/utils/
modules/Accounts/ modules/Contacts/ modules/Leads/ modules/Potentials/
modules/Products/ modules/Users/ modules/Vendors/ schema/
Message-ID: <20070111173918.2E9D078B0FC@vtiger.fosslabs.com>
Author: richie
Date: Thu Jan 11 10:38:54 2007
New Revision: 10035
Log:
* Revamped the Product - Lead/Account/Potential and Contact relationship. Now Product can be relate with n number of Leads/Accounts/Contact/Potentials and vice versa
Added:
vtigercrm/branches/5.0.3/modules/Accounts/updateRelations.php
Modified:
vtigercrm/branches/5.0.3/Smarty/templates/Popup.tpl
vtigercrm/branches/5.0.3/Smarty/templates/RelatedListContents.tpl
vtigercrm/branches/5.0.3/include/utils/DeleteUtils.php
vtigercrm/branches/5.0.3/include/utils/ListViewUtils.php
vtigercrm/branches/5.0.3/modules/Contacts/Contacts.php
vtigercrm/branches/5.0.3/modules/Contacts/updateRelations.php
vtigercrm/branches/5.0.3/modules/Leads/updateRelations.php
vtigercrm/branches/5.0.3/modules/Potentials/updateRelations.php
vtigercrm/branches/5.0.3/modules/Products/Products.php
vtigercrm/branches/5.0.3/modules/Products/updateRelations.php
vtigercrm/branches/5.0.3/modules/Users/DefaultDataPopulator.php
vtigercrm/branches/5.0.3/modules/Vendors/updateRelations.php
vtigercrm/branches/5.0.3/schema/DatabaseSchema.xml
Modified: vtigercrm/branches/5.0.3/Smarty/templates/Popup.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Popup.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Popup.tpl Thu Jan 11 10:38:54 2007
@@ -18,7 +18,7 @@
Modified: vtigercrm/branches/5.0.3/Smarty/templates/RelatedListContents.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/RelatedListContents.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/RelatedListContents.tpl Thu Jan 11 10:38:54 2007
@@ -31,7 +31,11 @@
{/if}
From vtigercrm-commits at vtiger.fosslabs.com Thu Jan 11 12:53:21 2007
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 11 Jan 2007 17:53:21 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r10037 - in
/vtigercrm/branches/5.0.3/modules/Migration: ./ DBChanges/ language/
Message-ID: <20070111175321.4F02F78B0FC@vtiger.fosslabs.com>
Author: richie
Date: Thu Jan 11 10:53:08 2007
New Revision: 10037
Log:
* Totally changed the file structure to run the migration for patches also
Added:
vtigercrm/branches/5.0.3/modules/Migration/DBChanges/
vtigercrm/branches/5.0.3/modules/Migration/DBChanges/42P2_to_50.php (with props)
vtigercrm/branches/5.0.3/modules/Migration/DBChanges/501_to_502.php (with props)
vtigercrm/branches/5.0.3/modules/Migration/DBChanges/502_to_503.php
vtigercrm/branches/5.0.3/modules/Migration/MigrationInfo.php (with props)
vtigercrm/branches/5.0.3/modules/Migration/PatchApply.php
vtigercrm/branches/5.0.3/modules/Migration/deleteCustomFields.php (with props)
vtigercrm/branches/5.0.3/modules/Migration/index.php
vtigercrm/branches/5.0.3/modules/Migration/rename_tables.php (with props)
vtigercrm/branches/5.0.3/modules/Migration/versions.php
Modified:
vtigercrm/branches/5.0.3/modules/Migration/Migration.php
vtigercrm/branches/5.0.3/modules/Migration/language/en_us.lang.php
Modified: vtigercrm/branches/5.0.3/modules/Migration/Migration.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Migration/Migration.php (original)
+++ vtigercrm/branches/5.0.3/modules/Migration/Migration.php Thu Jan 11 10:53:08 2007
@@ -299,8 +299,8 @@
//To handle the file includes for each and every version
//Here we have to decide which files should be included, where the files will be added newly for every public release
- //Handle Here -- Mickie
- include("modules/Migration/ModifyDatabase/MigrationInfo.php");
+ //In this included file we have included modules/Migration/DBChanges/42P2_to_50.php which will apply the db changes upto 5.0.
+ include("modules/Migration/MigrationInfo.php");
$migrationlog->debug("Mickie ---- Ends\n\n\n");
}
Modified: vtigercrm/branches/5.0.3/modules/Migration/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Migration/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Migration/language/en_us.lang.php Thu Jan 11 10:53:08 2007
@@ -75,6 +75,8 @@
'LBL_MYSQL_SERVER_PATH'=>'MySQL Server Path : ',
'LBL_MIGRATE_BUTTON'=>'Migrate',
'LBL_CANCEL_BUTTON'=>'Cancel',
+'LBL_UPGRADE_FROM_VTIGER_5X'=>'Upgrade database from vtiger CRM 5.x to next version',
+'LBL_PATCH_OR_MIGRATION'=>'you must specify the source database version (Patch update or Migration)',
);
From vtigercrm-commits at vtiger.fosslabs.com Thu Jan 11 12:55:55 2007
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Thu, 11 Jan 2007 17:55:55 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r10038 - in
/vtigercrm/branches/5.0.3/Smarty/templates: Migration.tpl SetMenu.tpl
Settings.tpl
Message-ID: <20070111175555.0199578B124@vtiger.fosslabs.com>
Author: richie
Date: Thu Jan 11 10:55:50 2007
New Revision: 10038
Log:
* Totally changed the file structure to run the migration for patches also
Added:
vtigercrm/branches/5.0.3/Smarty/templates/Migration.tpl
Modified:
vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl
vtigercrm/branches/5.0.3/Smarty/templates/Settings.tpl
Modified: vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl Thu Jan 11 10:55:50 2007
@@ -173,7 +173,7 @@
From vtigercrm-commits at vtiger.fosslabs.com Sat Jan 13 06:46:09 2007
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 13 Jan 2007 11:46:09 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r10054 - in
/vtigercrm/branches/5.0.3: include/utils/EditViewUtils.php
modules/Invoice/CreatePDF.php modules/PurchaseOrder/CreatePDF.php
modules/Quotes/CreatePDF.php modules/SalesOrder/CreateSOPDF.php
Message-ID: <20070113114609.37C1078B194@vtiger.fosslabs.com>
Author: richie
Date: Sat Jan 13 04:46:00 2007
New Revision: 10054
Log:
* Added call to from_html for description and terms&conditions fields which are not displayed correctly in pdf whey they have ampersand(&) and single quote and double quote, Fixes #2809
Modified:
vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php
vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php
vtigercrm/branches/5.0.3/modules/PurchaseOrder/CreatePDF.php
vtigercrm/branches/5.0.3/modules/Quotes/CreatePDF.php
vtigercrm/branches/5.0.3/modules/SalesOrder/CreateSOPDF.php
Modified: vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php
==============================================================================
--- vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php (original)
+++ vtigercrm/branches/5.0.3/include/utils/EditViewUtils.php Sat Jan 13 04:46:00 2007
@@ -1450,7 +1450,7 @@
$product_Detail[$i]['hdnProductId'.$i] = $hdnProductId;
$product_Detail[$i]['productName'.$i]= from_html($productname);
- $product_Detail[$i]['productDescription'.$i]= $productdescription;
+ $product_Detail[$i]['productDescription'.$i]= from_html($productdescription);
$product_Detail[$i]['comment'.$i]= $comment;
if($module != 'PurchaseOrder' && $focus->object_name != 'Order')
Modified: vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php (original)
+++ vtigercrm/branches/5.0.3/modules/Invoice/CreatePDF.php Sat Jan 13 04:46:00 2007
@@ -55,8 +55,8 @@
$ship_code = $focus->column_fields["ship_code"];
$ship_country = $focus->column_fields["ship_country"];
-$conditions = $focus->column_fields["terms_conditions"];
-$description = $focus->column_fields["description"];
+$conditions = from_html($focus->column_fields["terms_conditions"]);
+$description = from_html($focus->column_fields["description"]);
$status = $focus->column_fields["invoicestatus"];
// Company information
Modified: vtigercrm/branches/5.0.3/modules/PurchaseOrder/CreatePDF.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/PurchaseOrder/CreatePDF.php (original)
+++ vtigercrm/branches/5.0.3/modules/PurchaseOrder/CreatePDF.php Sat Jan 13 04:46:00 2007
@@ -53,8 +53,8 @@
$ship_code = $focus->column_fields["ship_code"];
$ship_country = $focus->column_fields["ship_country"];
-$conditions = $focus->column_fields["terms_conditions"];
-$description = $focus->column_fields["description"];
+$conditions = from_html($focus->column_fields["terms_conditions"]);
+$description = from_html($focus->column_fields["description"]);
$status = $focus->column_fields["postatus"];
// Company information
Modified: vtigercrm/branches/5.0.3/modules/Quotes/CreatePDF.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Quotes/CreatePDF.php (original)
+++ vtigercrm/branches/5.0.3/modules/Quotes/CreatePDF.php Sat Jan 13 04:46:00 2007
@@ -53,8 +53,8 @@
$ship_code = $focus->column_fields["ship_code"];
$ship_country = $focus->column_fields["ship_country"];
-$conditions = $focus->column_fields["terms_conditions"];
-$description = $focus->column_fields["description"];
+$conditions = from_html($focus->column_fields["terms_conditions"]);
+$description = from_html($focus->column_fields["description"]);
$status = $focus->column_fields["quotestage"];
// Company information
Modified: vtigercrm/branches/5.0.3/modules/SalesOrder/CreateSOPDF.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/SalesOrder/CreateSOPDF.php (original)
+++ vtigercrm/branches/5.0.3/modules/SalesOrder/CreateSOPDF.php Sat Jan 13 04:46:00 2007
@@ -53,8 +53,8 @@
$ship_code = $focus->column_fields["ship_code"];
$ship_country = $focus->column_fields["ship_country"];
-$conditions = $focus->column_fields["terms_conditions"];
-$description = $focus->column_fields["description"];
+$conditions = from_html($focus->column_fields["terms_conditions"]);
+$description = from_html($focus->column_fields["description"]);
$status = $focus->column_fields["sostatus"];
// Company information
From vtigercrm-commits at vtiger.fosslabs.com Sat Jan 13 07:56:22 2007
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Sat, 13 Jan 2007 12:56:22 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r10055 - in
/vtigercrm/branches/5.0.3: Smarty/templates/ include/js/ modules/Contacts/
modules/Emails/ modules/Leads/
Message-ID: <20070113125622.4EACC7895F3@vtiger.fosslabs.com>
Author: richie
Date: Sat Jan 13 05:56:11 2007
New Revision: 10055
Log:
Email validation in detail view and related list
Modified:
vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl
vtigercrm/branches/5.0.3/Smarty/templates/RelatedListContents.tpl
vtigercrm/branches/5.0.3/Smarty/templates/SelectEmail.tpl
vtigercrm/branches/5.0.3/include/js/general.js
vtigercrm/branches/5.0.3/modules/Contacts/CallRelatedList.php
vtigercrm/branches/5.0.3/modules/Emails/mailSelect.php
vtigercrm/branches/5.0.3/modules/Leads/CallRelatedList.php
vtigercrm/branches/5.0.3/modules/Leads/DetailView.php
Modified: vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/DetailView.tpl Sat Jan 13 05:56:11 2007
@@ -27,7 +27,6 @@
+
+
+
+
+
+
+
+
+
From vtigercrm-commits at vtiger.fosslabs.com Tue Jan 16 04:42:39 2007
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 16 Jan 2007 09:42:39 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r10065 -
/vtigercrm/branches/5.0.3/modules/Migration/PatchApply.php
Message-ID: <20070116094239.D94AD78B44D@vtiger.fosslabs.com>
Author: richie
Date: Tue Jan 16 02:42:34 2007
New Revision: 10065
Log:
* Added code to update the version in table
Modified:
vtigercrm/branches/5.0.3/modules/Migration/PatchApply.php
Modified: vtigercrm/branches/5.0.3/modules/Migration/PatchApply.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Migration/PatchApply.php (original)
+++ vtigercrm/branches/5.0.3/modules/Migration/PatchApply.php Tue Jan 16 02:42:34 2007
@@ -85,6 +85,8 @@
//HANDLE HERE - Mickie
//Here we have to update the version in table. so that when we do migration next time we will get the version
+global $adb, $vtiger_current_version;
+$adb->query("update vtiger_version set old_version='".$versions[$source_version]."',current_version='".$vtiger_current_version."'");
From vtigercrm-commits at vtiger.fosslabs.com Tue Jan 16 04:44:40 2007
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 16 Jan 2007 09:44:40 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r10066 -
/vtigercrm/branches/5.0.3/modules/Users/add2db.php
Message-ID: <20070116094440.C796D78B1C9@vtiger.fosslabs.com>
Author: richie
Date: Tue Jan 16 02:44:34 2007
New Revision: 10066
Log:
file moved to settings
Removed:
vtigercrm/branches/5.0.3/modules/Users/add2db.php
From vtigercrm-commits at vtiger.fosslabs.com Tue Jan 16 05:36:19 2007
From: vtigercrm-commits at vtiger.fosslabs.com (vtigercrm-commits at vtiger.fosslabs.com)
Date: Tue, 16 Jan 2007 10:36:19 -0000
Subject: [Vtigercrm-commits] [vtiger-commits] r10067 - in
/vtigercrm/branches/5.0.3: Smarty/templates/Header.tpl
include/js/general.js
Message-ID: <20070116103619.81B14789B58@vtiger.fosslabs.com>
Author: richie
Date: Tue Jan 16 03:36:14 2007
New Revision: 10067
Log:
validation error fixed
Modified:
vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl
vtigercrm/branches/5.0.3/include/js/general.js
Modified: vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Header.tpl Tue Jan 16 03:36:14 2007
@@ -145,6 +145,7 @@
";
echo '';
echo "
";
- echo "
vtiger CRM 5.0.3 | Visit www.vtiger.com for more information
";
+ echo "
vtiger CRM 5.0.3-rc2 | Visit www.vtiger.com for more information
+ 
