diff --git a/data/CRMEntity.php b/data/CRMEntity.php
index 45f691c26db068a16c6bd2a79f38a91796c28b17..dc367763c29fcc503134f747be144af97133a4eb 100755
--- a/data/CRMEntity.php
+++ b/data/CRMEntity.php
@@ -2204,6 +2204,86 @@ class CRMEntity {
return $query;
}
+ function getReportsUiType10Query($module, $queryPlanner){
+ $adb = PearDatabase::getInstance();
+ $relquery = '';
+ $matrix = $queryPlanner->newDependencyMatrix();
+
+ $params = array($module);
+ if($module == "Calendar") {
+ array_push($params,"Events");
+ }
+
+ $fields_query = $adb->pquery("SELECT vtiger_field.fieldname,vtiger_field.tablename,vtiger_field.fieldid from vtiger_field INNER JOIN vtiger_tab on vtiger_tab.name IN (". generateQuestionMarks($params).") WHERE vtiger_tab.tabid=vtiger_field.tabid AND vtiger_field.uitype IN (10) AND vtiger_field.presence IN (0,2)", $params);
+
+ if ($adb->num_rows($fields_query) > 0) {
+ for ($i = 0; $i < $adb->num_rows($fields_query); $i++) {
+ $field_name = $adb->query_result($fields_query, $i, 'fieldname');
+ $field_id = $adb->query_result($fields_query, $i, 'fieldid');
+ $tab_name = $adb->query_result($fields_query, $i, 'tablename');
+ $ui10_modules_query = $adb->pquery("SELECT relmodule FROM vtiger_fieldmodulerel WHERE fieldid=?", array($field_id));
+
+ if ($adb->num_rows($ui10_modules_query) > 0) {
+
+ // Capture the forward table dependencies due to dynamic related-field
+ $crmentityRelModuleFieldTable = "vtiger_crmentityRel$module$field_id";
+
+ $crmentityRelModuleFieldTableDeps = array();
+ $calendarFlag = false;
+ for ($j = 0; $j < $adb->num_rows($ui10_modules_query); $j++) {
+ $rel_mod = $adb->query_result($ui10_modules_query, $j, 'relmodule');
+ if(vtlib_isModuleActive($rel_mod)) {
+ if($rel_mod == 'Calendar') {
+ $calendarFlag = true;
+ }
+ if($calendarFlag && $rel_mod == 'Events') {
+ continue;
+ }
+ $rel_obj = CRMEntity::getInstance($rel_mod);
+ vtlib_setup_modulevars($rel_mod, $rel_obj);
+
+ $rel_tab_name = $rel_obj->table_name;
+ $rel_tab_index = $rel_obj->table_index;
+ $crmentityRelModuleFieldTableDeps[] = $rel_tab_name . "Rel$module$field_id";
+ }
+ }
+
+ $matrix->setDependency($crmentityRelModuleFieldTable, $crmentityRelModuleFieldTableDeps);
+ $matrix->addDependency($tab_name, $crmentityRelModuleFieldTable);
+
+ if ($queryPlanner->requireTable($crmentityRelModuleFieldTable, $matrix)) {
+ $relquery.= " LEFT JOIN vtiger_crmentity AS $crmentityRelModuleFieldTable ON $crmentityRelModuleFieldTable.crmid = $tab_name.$field_name AND vtiger_crmentityRel$module$field_id.deleted=0";
+ }
+
+ $calendarFlag = false;
+ for ($j = 0; $j < $adb->num_rows($ui10_modules_query); $j++) {
+ $rel_mod = $adb->query_result($ui10_modules_query, $j, 'relmodule');
+ if(vtlib_isModuleActive($rel_mod)) {
+ if($rel_mod == 'Calendar') {
+ $calendarFlag = true;
+ }
+ if($calendarFlag && $rel_mod == 'Events') {
+ continue;
+ }
+ $rel_obj = CRMEntity::getInstance($rel_mod);
+ vtlib_setup_modulevars($rel_mod, $rel_obj);
+
+ $rel_tab_name = $rel_obj->table_name;
+ $rel_tab_index = $rel_obj->table_index;
+
+ $rel_tab_name_rel_module_table_alias = $rel_tab_name . "Rel$module$field_id";
+
+ if ($queryPlanner->requireTable($rel_tab_name_rel_module_table_alias)) {
+ $relquery.= " LEFT JOIN $rel_tab_name AS $rel_tab_name_rel_module_table_alias ON $rel_tab_name_rel_module_table_alias.$rel_tab_index = $crmentityRelModuleFieldTable.crmid";
+ }
+ }
+ }
+ }
+ }
+ }
+ return $relquery;
+ }
+
/*
* Function to get the security query part of a report
* @param - $module primary module name
diff --git a/modules/Accounts/Accounts.php b/modules/Accounts/Accounts.php
index 88ce07fca2253b47266c30e74fe2b27b1ed61188..821a5534f1ed57fa9f7beb4d784b6bcf5e533b31 100644
--- a/modules/Accounts/Accounts.php
+++ b/modules/Accounts/Accounts.php
@@ -1123,6 +1123,8 @@ class Accounts extends CRMEntity {
if ($queryPlanner->requireTable("vtiger_createdbyAccounts")){
$query .= " left join vtiger_users as vtiger_createdbyAccounts on vtiger_createdbyAccounts.id = vtiger_crmentityAccounts.smcreatorid ";
}
+ //if secondary modules custom reference field is selected
+ $query .= parent::getReportsUiType10Query($secmodule, $queryPlanner);
return $query;
}
diff --git a/modules/Calendar/Activity.php b/modules/Calendar/Activity.php
index 545cda9389e9853eaa715e8fb60857e3c6bc1d76..77f4cb79a186500949ebfc3bae241f77b97a565f 100644
--- a/modules/Calendar/Activity.php
+++ b/modules/Calendar/Activity.php
@@ -1043,6 +1043,9 @@ function insertIntoRecurringTable(& $recurObj)
if ($queryPlanner->requireTable("vtiger_createdbyCalendar")){
$query .= " left join vtiger_users as vtiger_createdbyCalendar on vtiger_createdbyCalendar.id = vtiger_crmentityCalendar.smcreatorid ";
}
+ //if secondary modules custom reference field is selected
+ $query .= parent::getReportsUiType10Query($secmodule, $queryPlanner);
+
return $query;
}
diff --git a/modules/Campaigns/Campaigns.php b/modules/Campaigns/Campaigns.php
index f688fc959f712f10651bd92df0e3466366fd0987..1d910bcc36d591cc60a7027e182a8d34922a50e3 100644
--- a/modules/Campaigns/Campaigns.php
+++ b/modules/Campaigns/Campaigns.php
@@ -596,6 +596,10 @@ class Campaigns extends CRMEntity {
if ($queryplanner->requireTable("vtiger_createdbyCampaigns")){
$query .= " left join vtiger_users as vtiger_createdbyCampaigns on vtiger_createdbyCampaigns.id = vtiger_crmentityCampaigns.smcreatorid ";
}
+
+ //if secondary modules custom reference field is selected
+ $query .= parent::getReportsUiType10Query($secmodule, $queryPlanner);
+
return $query;
}
diff --git a/modules/Contacts/Contacts.php b/modules/Contacts/Contacts.php
index 99b175ed17c5d38d26d1b3b1b59b2228cb8d17b5..19f12b376a64ff278c7216795804ca35852527e8 100644
--- a/modules/Contacts/Contacts.php
+++ b/modules/Contacts/Contacts.php
@@ -1356,6 +1356,10 @@ function get_contactsforol($user_name)
if ($queryplanner->requireTable("vtiger_createdbyContacts")){
$query .= " left join vtiger_users as vtiger_createdbyContacts on vtiger_createdbyContacts.id = vtiger_crmentityContacts.smcreatorid ";
}
+
+ //if secondary modules custom reference field is selected
+ $query .= parent::getReportsUiType10Query($secmodule, $queryPlanner);
+
return $query;
}
diff --git a/modules/Documents/Documents.php b/modules/Documents/Documents.php
index 899b14b40e52afccdbe556a9a0354c55c0f5375a..72f07624ff881957cfd2650eb30b69dc8b12e1c6 100644
--- a/modules/Documents/Documents.php
+++ b/modules/Documents/Documents.php
@@ -351,6 +351,8 @@ class Documents extends CRMEntity {
if ($queryplanner->requireTable("vtiger_lastModifiedBy".$module)){
$query .= " left join vtiger_users as vtiger_lastModifiedBy".$module." on vtiger_lastModifiedBy".$module.".id = vtiger_crmentity.modifiedby ";
}
+ $relQuery = $this->getReportsUiType10Query($module,$queryplanner);
+ $query .= ' '.$relQuery;
return $query;
}
@@ -391,6 +393,10 @@ class Documents extends CRMEntity {
if ($queryplanner->requireTable("vtiger_createdbyDocuments")){
$query .= " left join vtiger_users as vtiger_createdbyDocuments on vtiger_createdbyDocuments.id = vtiger_crmentityDocuments.smcreatorid ";
}
+
+ //if secondary modules custom reference field is selected
+ $query .= parent::getReportsUiType10Query($secmodule, $queryPlanner);
+
return $query;
}
diff --git a/modules/Emails/Emails.php b/modules/Emails/Emails.php
index 052c8106f71440e4247818845f916d3970c4dd02..f3dac4473ecedbf522c468277a292c54188eb6e3 100644
--- a/modules/Emails/Emails.php
+++ b/modules/Emails/Emails.php
@@ -611,6 +611,10 @@ class Emails extends CRMEntity {
if ($queryPlanner->requireTable("vtiger_email_track")){
$query .= " LEFT JOIN vtiger_email_track ON vtiger_email_track.mailid = vtiger_activityEmails.activityid and vtiger_email_track.crmid = ".$focus->table_name.".".$focus->table_index;
}
+
+ //if secondary modules custom reference field is selected
+ $query .= parent::getReportsUiType10Query($secmodule, $queryPlanner);
+
return $query;
}
diff --git a/modules/HelpDesk/HelpDesk.php b/modules/HelpDesk/HelpDesk.php
index 0f820bccb928dc68698a6b33a07722baf14a1065..e9a21606489c1915d61a2f0e74104e18ba4fdc30 100644
--- a/modules/HelpDesk/HelpDesk.php
+++ b/modules/HelpDesk/HelpDesk.php
@@ -634,6 +634,10 @@ case when (vtiger_users.user_name not like '') then $userNameSql else vtiger_gro
if ($queryplanner->requireTable("vtiger_createdbyHelpDesk")){
$query .= " left join vtiger_users as vtiger_createdbyHelpDesk on vtiger_createdbyHelpDesk.id = vtiger_crmentityHelpDesk.smcreatorid ";
}
+
+ //if secondary modules custom reference field is selected
+ $query .= parent::getReportsUiType10Query($secmodule, $queryPlanner);
+
return $query;
}
diff --git a/modules/Invoice/Invoice.php b/modules/Invoice/Invoice.php
index ef06171c10c75119e74e9dbeed863079fa3411c8..01b57227b8896b1b9ad4cd20382a6e0bcb0c6d47 100755
--- a/modules/Invoice/Invoice.php
+++ b/modules/Invoice/Invoice.php
@@ -417,6 +417,10 @@ class Invoice extends CRMEntity {
if ($queryPlanner->requireTable("vtiger_createdbyInvoice")){
$query .= " left join vtiger_users as vtiger_createdbyInvoice on vtiger_createdbyInvoice.id = vtiger_crmentityInvoice.smcreatorid ";
}
+
+ //if secondary modules custom reference field is selected
+ $query .= parent::getReportsUiType10Query($secmodule, $queryPlanner);
+
return $query;
}
diff --git a/modules/Leads/Leads.php b/modules/Leads/Leads.php
index 6978ca147f769d9419795034b649372248625e08..bd7bb6ae64d8841a7d91e71bdfcd38de2ee72f81 100755
--- a/modules/Leads/Leads.php
+++ b/modules/Leads/Leads.php
@@ -602,6 +602,10 @@ class Leads extends CRMEntity {
if ($queryPlanner->requireTable("vtiger_createdbyLeads")){
$query .= " left join vtiger_users as vtiger_createdbyLeads on vtiger_createdbyLeads.id = vtiger_crmentityLeads.smcreatorid ";
}
+
+ //if secondary modules custom reference field is selected
+ $query .= parent::getReportsUiType10Query($secmodule, $queryPlanner);
+
return $query;
}
diff --git a/modules/Potentials/Potentials.php b/modules/Potentials/Potentials.php
index 8f597b79b43944e3d15d31973a8f7c4534849fcf..ef234d976d1dfe7c9252e0cd99904f201eb07f7f 100644
--- a/modules/Potentials/Potentials.php
+++ b/modules/Potentials/Potentials.php
@@ -687,6 +687,10 @@ class Potentials extends CRMEntity {
if ($queryplanner->requireTable("vtiger_createdbyPotentials")){
$query .= " left join vtiger_users as vtiger_createdbyPotentials on vtiger_createdbyPotentials.id = vtiger_crmentityPotentials.smcreatorid ";
}
+
+ //if secondary modules custom reference field is selected
+ $query .= parent::getReportsUiType10Query($secmodule, $queryPlanner);
+
return $query;
}
diff --git a/modules/PriceBooks/PriceBooks.php b/modules/PriceBooks/PriceBooks.php
index 8c4ba0f8b7e611700657f90646d2011e23e79e71..7cb40558626321714ea80cda5bf265470f0ce310 100755
--- a/modules/PriceBooks/PriceBooks.php
+++ b/modules/PriceBooks/PriceBooks.php
@@ -316,6 +316,10 @@ class PriceBooks extends CRMEntity {
if ($queryplanner->requireTable("vtiger_createdbyPriceBooks")){
$query .= " left join vtiger_users as vtiger_createdbyPriceBooks on vtiger_createdbyPriceBooks.id = vtiger_crmentityPriceBooks.smcreatorid ";
}
+
+ //if secondary modules custom reference field is selected
+ $query .= parent::getReportsUiType10Query($secmodule, $queryPlanner);
+
return $query;
}
diff --git a/modules/Products/Products.php b/modules/Products/Products.php
index efbf1e70ffe9acb9e072af585712e2d34476af22..93e328638c3680a3ecb31ed1724a54e4506d7df5 100755
--- a/modules/Products/Products.php
+++ b/modules/Products/Products.php
@@ -1228,6 +1228,10 @@ class Products extends CRMEntity {
if ($queryplanner->requireTable("vtiger_createdbyProducts")){
$query .= " left join vtiger_users as vtiger_createdbyProducts on vtiger_createdbyProducts.id = vtiger_crmentityProducts.smcreatorid ";
}
+
+ //if secondary modules custom reference field is selected
+ $query .= parent::getReportsUiType10Query($secmodule, $queryPlanner);
+
return $query;
}
diff --git a/modules/PurchaseOrder/PurchaseOrder.php b/modules/PurchaseOrder/PurchaseOrder.php
index 104249b917e19f17dee7a41698c2ab247c0b70f3..81c15375af4e4c61f662b58413ecc3a4a5836cd9 100644
--- a/modules/PurchaseOrder/PurchaseOrder.php
+++ b/modules/PurchaseOrder/PurchaseOrder.php
@@ -488,6 +488,10 @@ class PurchaseOrder extends CRMEntity {
if ($queryPlanner->requireTable("vtiger_createdbyPurchaseOrder")){
$query .= " left join vtiger_users as vtiger_createdbyPurchaseOrder on vtiger_createdbyPurchaseOrder.id = vtiger_crmentityPurchaseOrder.smcreatorid ";
}
+
+ //if secondary modules custom reference field is selected
+ $query .= parent::getReportsUiType10Query($secmodule, $queryPlanner);
+
return $query;
}
diff --git a/modules/Quotes/Quotes.php b/modules/Quotes/Quotes.php
index b42cd5f095551852ee37b29a3fb655011da694c3..4df4199d4381098a513385b00c4a655fc561ed09 100755
--- a/modules/Quotes/Quotes.php
+++ b/modules/Quotes/Quotes.php
@@ -417,6 +417,10 @@ class Quotes extends CRMEntity {
if ($queryPlanner->requireTable("vtiger_createdbyQuotes")){
$query .= " left join vtiger_users as vtiger_createdbyQuotes on vtiger_createdbyQuotes.id = vtiger_crmentityQuotes.smcreatorid ";
}
+
+ //if secondary modules custom reference field is selected
+ $query .= parent::getReportsUiType10Query($secmodule, $queryPlanner);
+
return $query;
}
diff --git a/modules/Reports/ReportRun.php b/modules/Reports/ReportRun.php
index 44af415b788c0419356598a835a10cb78307ec20..617ec6ba55daa40109d76f160164342ef131f4cf 100644
--- a/modules/Reports/ReportRun.php
+++ b/modules/Reports/ReportRun.php
@@ -2221,6 +2221,10 @@ class ReportRun extends CRMEntity {
$query .= " left join vtiger_users as vtiger_createdbyLeads on vtiger_createdbyLeads.id = vtiger_crmentity.smcreatorid";
}
+ $focus = CRMEntity::getInstance($module);
+ $relquery = $focus->getReportsUiType10Query($module, $this->queryPlanner);
+ $query .= $relquery . ' ';
+
$query .= " " . $this->getRelatedModulesQuery($module,$this->secondarymodule).
getNonAdminAccessControlQuery($this->primarymodule,$current_user).
" where vtiger_crmentity.deleted=0 and vtiger_leaddetails.converted=0";
@@ -2257,6 +2261,10 @@ class ReportRun extends CRMEntity {
$query .= " left join vtiger_users as vtiger_createdbyAccounts on vtiger_createdbyAccounts.id = vtiger_crmentity.smcreatorid";
}
+ $focus = CRMEntity::getInstance($module);
+ $relquery = $focus->getReportsUiType10Query($module, $this->queryPlanner);
+ $query .= $relquery . ' ';
+
$query .= " ".$this->getRelatedModulesQuery($module,$this->secondarymodule).
getNonAdminAccessControlQuery($this->primarymodule,$current_user).
" where vtiger_crmentity.deleted=0 ";
@@ -2299,6 +2307,10 @@ class ReportRun extends CRMEntity {
$query .= " left join vtiger_users as vtiger_createdbyContacts on vtiger_createdbyContacts.id = vtiger_crmentity.smcreatorid";
}
+ $focus = CRMEntity::getInstance($module);
+ $relquery = $focus->getReportsUiType10Query($module, $this->queryPlanner);
+ $query .= $relquery . ' ';
+
$query .= " ".$this->getRelatedModulesQuery($module,$this->secondarymodule).
getNonAdminAccessControlQuery($this->primarymodule,$current_user).
" where vtiger_crmentity.deleted=0";
@@ -2335,6 +2347,11 @@ class ReportRun extends CRMEntity {
if ($this->queryPlanner->requireTable('vtiger_createdbyPotentials')) {
$query .= " left join vtiger_users as vtiger_createdbyPotentials on vtiger_createdbyPotentials.id = vtiger_crmentity.smcreatorid";
}
+
+ $focus = CRMEntity::getInstance($module);
+ $relquery = $focus->getReportsUiType10Query($module, $this->queryPlanner);
+ $query .= $relquery . ' ';
+
$query .= " ".$this->getRelatedModulesQuery($module,$this->secondarymodule).
getNonAdminAccessControlQuery($this->primarymodule,$current_user).
" where vtiger_crmentity.deleted=0 ";
@@ -2374,6 +2391,11 @@ class ReportRun extends CRMEntity {
AND vtiger_productcurrencyrel.currencyid = " . $current_user->currency_id . "
) AS innerProduct ON innerProduct.productid = vtiger_products.productid";
}
+
+ $focus = CRMEntity::getInstance($module);
+ $relquery = $focus->getReportsUiType10Query($module, $this->queryPlanner);
+ $query .= $relquery . ' ';
+
$query .= " ".$this->getRelatedModulesQuery($module,$this->secondarymodule).
getNonAdminAccessControlQuery($this->primarymodule,$current_user)."
where vtiger_crmentity.deleted=0";
@@ -2417,6 +2439,10 @@ class ReportRun extends CRMEntity {
$query .= " left join vtiger_users as vtiger_createdbyHelpDesk on vtiger_createdbyHelpDesk.id = vtiger_crmentity.smcreatorid";
}
+ $focus = CRMEntity::getInstance($module);
+ $relquery = $focus->getReportsUiType10Query($module, $this->queryPlanner);
+ $query .= $relquery . ' ';
+
$query .= " ".$this->getRelatedModulesQuery($module,$this->secondarymodule).
getNonAdminAccessControlQuery($this->primarymodule,$current_user).
" where vtiger_crmentity.deleted=0 ";
@@ -2488,6 +2514,10 @@ class ReportRun extends CRMEntity {
$query .= " left join vtiger_users as vtiger_createdbyCalendar on vtiger_createdbyCalendar.id = vtiger_crmentity.smcreatorid";
}
+ $focus = CRMEntity::getInstance($module);
+ $relquery = $focus->getReportsUiType10Query($module, $this->queryPlanner);
+ $query .= $relquery . ' ';
+
$query .= " ".$this->getRelatedModulesQuery($module,$this->secondarymodule).
getNonAdminAccessControlQuery($this->primarymodule,$current_user).
" WHERE vtiger_crmentity.deleted=0 and (vtiger_activity.activitytype != 'Emails')";
@@ -2557,6 +2587,11 @@ class ReportRun extends CRMEntity {
if ($this->queryPlanner->requireTable('vtiger_currency_info')) {
$query .= ' LEFT JOIN vtiger_currency_info ON vtiger_currency_info.id = vtiger_quotes.currency_id';
}
+
+ $focus = CRMEntity::getInstance($module);
+ $relquery = $focus->getReportsUiType10Query($module, $this->queryPlanner);
+ $query .= $relquery . ' ';
+
$focus = CRMEntity::getInstance($module);
$query .= " " . $this->getRelatedModulesQuery($module, $this->secondarymodule) .
getNonAdminAccessControlQuery($this->primarymodule, $current_user) .
@@ -2622,6 +2657,11 @@ class ReportRun extends CRMEntity {
if ($this->queryPlanner->requireTable('vtiger_currency_info')) {
$query .= ' LEFT JOIN vtiger_currency_info ON vtiger_currency_info.id = vtiger_purchaseorder.currency_id';
}
+
+ $focus = CRMEntity::getInstance($module);
+ $relquery = $focus->getReportsUiType10Query($module, $this->queryPlanner);
+ $query .= $relquery . ' ';
+
$query .= " " . $this->getRelatedModulesQuery($module, $this->secondarymodule) .
getNonAdminAccessControlQuery($this->primarymodule, $current_user) .
" where vtiger_crmentity.deleted=0";
@@ -2687,6 +2727,11 @@ class ReportRun extends CRMEntity {
if ($this->queryPlanner->requireTable('vtiger_currency_info')) {
$query .= ' LEFT JOIN vtiger_currency_info ON vtiger_currency_info.id = vtiger_invoice.currency_id';
}
+
+ $focus = CRMEntity::getInstance($module);
+ $relquery = $focus->getReportsUiType10Query($module, $this->queryPlanner);
+ $query .= $relquery . ' ';
+
$query .= " " . $this->getRelatedModulesQuery($module, $this->secondarymodule) .
getNonAdminAccessControlQuery($this->primarymodule, $current_user) .
" where vtiger_crmentity.deleted=0";
@@ -2756,6 +2801,11 @@ class ReportRun extends CRMEntity {
if ($this->queryPlanner->requireTable('vtiger_currency_info')) {
$query .= ' LEFT JOIN vtiger_currency_info ON vtiger_currency_info.id = vtiger_salesorder.currency_id';
}
+
+ $focus = CRMEntity::getInstance($module);
+ $relquery = $focus->getReportsUiType10Query($module, $this->queryPlanner);
+ $query .= $relquery . ' ';
+
$query .= " " . $this->getRelatedModulesQuery($module, $this->secondarymodule) .
getNonAdminAccessControlQuery($this->primarymodule, $current_user) .
" where vtiger_crmentity.deleted=0";
@@ -2786,6 +2836,10 @@ class ReportRun extends CRMEntity {
$query .= " left join vtiger_users as vtiger_createdby$module on vtiger_createdby$module.id = vtiger_crmentity.smcreatorid";
}
+ $focus = CRMEntity::getInstance($module);
+ $relquery = $focus->getReportsUiType10Query($module, $this->queryPlanner);
+ $query .= $relquery . ' ';
+
$query .= " ".$this->getRelatedModulesQuery($module,$this->secondarymodule).
getNonAdminAccessControlQuery($this->primarymodule,$current_user).
" where vtiger_crmentity.deleted=0";
@@ -2814,6 +2868,10 @@ class ReportRun extends CRMEntity {
$query .= " left join vtiger_users as vtiger_createdby$module on vtiger_createdby$module.id = vtiger_crmentity.smcreatorid";
}
+ $focus = CRMEntity::getInstance($module);
+ $relquery = $focus->getReportsUiType10Query($module, $this->queryPlanner);
+ $query .= $relquery . ' ';
+
$query .= " ".$this->getRelatedModulesQuery($module,$this->secondarymodule).
getNonAdminAccessControlQuery($this->primarymodule,$current_user).
" WHERE vtiger_crmentity.deleted = 0";
diff --git a/modules/SalesOrder/SalesOrder.php b/modules/SalesOrder/SalesOrder.php
index bea37dd988c5a865b4e6dea900f3d9d81a041130..3e4b3e8bab1971a214804203f8f512173929c855 100644
--- a/modules/SalesOrder/SalesOrder.php
+++ b/modules/SalesOrder/SalesOrder.php
@@ -391,6 +391,10 @@ class SalesOrder extends CRMEntity {
if ($queryPlanner->requireTable("vtiger_createdbySalesOrder")){
$query .= " left join vtiger_users as vtiger_createdbySalesOrder on vtiger_createdbySalesOrder.id = vtiger_crmentitySalesOrder.smcreatorid ";
}
+
+ //if secondary modules custom reference field is selected
+ $query .= parent::getReportsUiType10Query($secmodule, $queryPlanner);
+
return $query;
}
diff --git a/modules/Vendors/Vendors.php b/modules/Vendors/Vendors.php
index 97b3cb16ead7e23e886fb3abdb8575a5dec33458..d5d883e72a8064d3f1be19b45206b06d8dc6996c 100755
--- a/modules/Vendors/Vendors.php
+++ b/modules/Vendors/Vendors.php
@@ -440,6 +440,9 @@ class Vendors extends CRMEntity {
if ($queryplanner->requireTable("vtiger_createdbyVendors")){
$query .= " left join vtiger_users as vtiger_createdbyVendors on vtiger_createdbyVendors.id = vtiger_crmentityVendors.smcreatorid ";
}
+ //if secondary modules custom reference field is selected
+ $query .= parent::getReportsUiType10Query($secmodule, $queryPlanner);
+
return $query;
}
diff --git a/packages/vtiger/mandatory/Import.zip b/packages/vtiger/mandatory/Import.zip
index ce9bca05a23ee28195727e16d72b80cdc048ce7e..4e03c531518df48afecfcae1fcef473ffc0ebc4a 100644
Binary files a/packages/vtiger/mandatory/Import.zip and b/packages/vtiger/mandatory/Import.zip differ
diff --git a/packages/vtiger/mandatory/MailManager.zip b/packages/vtiger/mandatory/MailManager.zip
index 2fe6b5cc5cd9e5f9b7451bff2602e98ab3c2cf50..2d4485d4f68887912e77f766286108262e0e653d 100644
Binary files a/packages/vtiger/mandatory/MailManager.zip and b/packages/vtiger/mandatory/MailManager.zip differ
diff --git a/packages/vtiger/mandatory/Mobile.zip b/packages/vtiger/mandatory/Mobile.zip
index c61cec33971f4a34a3c66faefd35c56b100dfead..290124ea1f1471e2b5764bf981d2e8d01cf2bba4 100644
Binary files a/packages/vtiger/mandatory/Mobile.zip and b/packages/vtiger/mandatory/Mobile.zip differ
diff --git a/packages/vtiger/mandatory/ModTracker.zip b/packages/vtiger/mandatory/ModTracker.zip
index 02853597796732e4b510db5077cd20fe2d3179a8..c8b58096eac6558f94136805844e63a04273f469 100644
Binary files a/packages/vtiger/mandatory/ModTracker.zip and b/packages/vtiger/mandatory/ModTracker.zip differ
diff --git a/packages/vtiger/mandatory/PBXManager.zip b/packages/vtiger/mandatory/PBXManager.zip
index bf91d4ad4f9cd89b717a4b5de195e292fde566ae..edc1c6cfb64e75456a3e88614b224d5d012a66ef 100644
Binary files a/packages/vtiger/mandatory/PBXManager.zip and b/packages/vtiger/mandatory/PBXManager.zip differ
diff --git a/packages/vtiger/mandatory/ServiceContracts.zip b/packages/vtiger/mandatory/ServiceContracts.zip
index 30cc68a93136225278a7dd8216cbe163fac80de2..c5888493028676ab887d54df5dbdb120f5cc479c 100644
Binary files a/packages/vtiger/mandatory/ServiceContracts.zip and b/packages/vtiger/mandatory/ServiceContracts.zip differ
diff --git a/packages/vtiger/mandatory/Services.zip b/packages/vtiger/mandatory/Services.zip
index 98c94005d39bc2b49f1057c905ba1fcaabe250a1..22ed0908be2edd2a5f6311c8fd4051095bd609b2 100644
Binary files a/packages/vtiger/mandatory/Services.zip and b/packages/vtiger/mandatory/Services.zip differ
diff --git a/packages/vtiger/mandatory/WSAPP.zip b/packages/vtiger/mandatory/WSAPP.zip
index 0cd5532a1f8be8842b108b65c075a724af36f49e..0551d799eef7318f994951d443379e05cd1d20cb 100644
Binary files a/packages/vtiger/mandatory/WSAPP.zip and b/packages/vtiger/mandatory/WSAPP.zip differ
diff --git a/packages/vtiger/marketplace/ExtensionStore.zip b/packages/vtiger/marketplace/ExtensionStore.zip
index bdb964bf580ac327111e2dc2134b7a897b57b33f..d56481b16e2913daafc6bc314b163cb770a104cc 100644
Binary files a/packages/vtiger/marketplace/ExtensionStore.zip and b/packages/vtiger/marketplace/ExtensionStore.zip differ
diff --git a/packages/vtiger/optional/Arabic_ar_ae.zip b/packages/vtiger/optional/Arabic_ar_ae.zip
index aeabcddc944ea34146366451ffda9c7d054e242f..7bffc79ab34ebab239164c7728ec22b1d26ed3b4 100644
Binary files a/packages/vtiger/optional/Arabic_ar_ae.zip and b/packages/vtiger/optional/Arabic_ar_ae.zip differ
diff --git a/packages/vtiger/optional/Assets.zip b/packages/vtiger/optional/Assets.zip
index e6c8203844b0831241ea7c00fefa16d960a9fe16..ba8afbdc7d68fb9d89cc40d0b23e9b5933710f2d 100644
Binary files a/packages/vtiger/optional/Assets.zip and b/packages/vtiger/optional/Assets.zip differ
diff --git a/packages/vtiger/optional/BrazilianLanguagePack_bz_bz.zip b/packages/vtiger/optional/BrazilianLanguagePack_bz_bz.zip
index 66133b0e1823fcc8e6f26c728a06de04192eac1c..8f10f0b4bc8ff03b1287e5c583f868af823bd8d2 100644
Binary files a/packages/vtiger/optional/BrazilianLanguagePack_bz_bz.zip and b/packages/vtiger/optional/BrazilianLanguagePack_bz_bz.zip differ
diff --git a/packages/vtiger/optional/BritishLanguagePack_br_br.zip b/packages/vtiger/optional/BritishLanguagePack_br_br.zip
index 2315d0ef41eeb576039dfff91d8a9d1b296b0f26..04bb95138c3cbdae94fadf2b7c1bf1edf38d8709 100644
Binary files a/packages/vtiger/optional/BritishLanguagePack_br_br.zip and b/packages/vtiger/optional/BritishLanguagePack_br_br.zip differ
diff --git a/packages/vtiger/optional/CustomerPortal.zip b/packages/vtiger/optional/CustomerPortal.zip
index f809f27d8dd2ec50b4db677422186a86b936a8ea..8b7f29b7569f3ae567409f4251f239148c839d5c 100644
Binary files a/packages/vtiger/optional/CustomerPortal.zip and b/packages/vtiger/optional/CustomerPortal.zip differ
diff --git a/packages/vtiger/optional/Deutsch.zip b/packages/vtiger/optional/Deutsch.zip
index 681fbc8b31d2afcd4ec3509479e0b9a1f568657c..17faa518c95b16dc02b970ce2613c425c36233a9 100644
Binary files a/packages/vtiger/optional/Deutsch.zip and b/packages/vtiger/optional/Deutsch.zip differ
diff --git a/packages/vtiger/optional/Dutch.zip b/packages/vtiger/optional/Dutch.zip
index 60c8cff90f3436e459906773407ca95fa255ee38..086ee6bbc17b21901edb4e202699cc1613816880 100644
Binary files a/packages/vtiger/optional/Dutch.zip and b/packages/vtiger/optional/Dutch.zip differ
diff --git a/packages/vtiger/optional/EmailTemplates.zip b/packages/vtiger/optional/EmailTemplates.zip
index 9e438965635e0355bdb70319083362f9acde1338..ab89c632fff3a37559dd75d564cfd57d0cd8cb56 100644
Binary files a/packages/vtiger/optional/EmailTemplates.zip and b/packages/vtiger/optional/EmailTemplates.zip differ
diff --git a/packages/vtiger/optional/French.zip b/packages/vtiger/optional/French.zip
index 8335c188c00de3341e44062c9b89e2f38d4d04a0..c11d3e9fc60eb5fc5709dc21cff72d4488b8d761 100644
Binary files a/packages/vtiger/optional/French.zip and b/packages/vtiger/optional/French.zip differ
diff --git a/packages/vtiger/optional/Google.zip b/packages/vtiger/optional/Google.zip
index 7af27beaefa686d2dce53cf5113ada3acad9e9ec..1c08c4a2fb0be8a6b524241f18e5f80926abc2a3 100644
Binary files a/packages/vtiger/optional/Google.zip and b/packages/vtiger/optional/Google.zip differ
diff --git a/packages/vtiger/optional/Hungarian.zip b/packages/vtiger/optional/Hungarian.zip
index 2a97e8373916d10ac89390cbc5ab249510e02fd6..f2b3a17b2f15c0a033166931bc14ab227b3e06bf 100644
Binary files a/packages/vtiger/optional/Hungarian.zip and b/packages/vtiger/optional/Hungarian.zip differ
diff --git a/packages/vtiger/optional/ItalianLanguagePack_it_it.zip b/packages/vtiger/optional/ItalianLanguagePack_it_it.zip
index 1c5a5165ba070fbf26aea33dc56d9f3b0d1d03a1..aa0a6952545ec433ca8081656f5c6ce61b9d8254 100644
Binary files a/packages/vtiger/optional/ItalianLanguagePack_it_it.zip and b/packages/vtiger/optional/ItalianLanguagePack_it_it.zip differ
diff --git a/packages/vtiger/optional/MexicanSpanishLanguagePack_es_mx.zip b/packages/vtiger/optional/MexicanSpanishLanguagePack_es_mx.zip
index 9b7da0e92bef6ffdfbddd5b65530d1740fdd6de1..86588e380feed0267a3a4b0ca31a3ac3e04ae4d6 100644
Binary files a/packages/vtiger/optional/MexicanSpanishLanguagePack_es_mx.zip and b/packages/vtiger/optional/MexicanSpanishLanguagePack_es_mx.zip differ
diff --git a/packages/vtiger/optional/ModComments.zip b/packages/vtiger/optional/ModComments.zip
index 010fc9a9621fa2b0903c79546a474d03fb68b7e1..cf626d90f691089f9c31e78f19759c95b4797f84 100644
Binary files a/packages/vtiger/optional/ModComments.zip and b/packages/vtiger/optional/ModComments.zip differ
diff --git a/packages/vtiger/optional/PolishLanguagePack_pl_pl.zip b/packages/vtiger/optional/PolishLanguagePack_pl_pl.zip
index f789f3926a58ef161689f34e5192fcab4d81a0e8..6a27148786fafa4f4ee2606e1ed7153fab35e230 100644
Binary files a/packages/vtiger/optional/PolishLanguagePack_pl_pl.zip and b/packages/vtiger/optional/PolishLanguagePack_pl_pl.zip differ
diff --git a/packages/vtiger/optional/Projects.zip b/packages/vtiger/optional/Projects.zip
index ab189c4700d1ebac8e5be6416e0d1b67a8ffe043..d40c326ad1be179aff7e55c42006402afc48cbca 100644
Binary files a/packages/vtiger/optional/Projects.zip and b/packages/vtiger/optional/Projects.zip differ
diff --git a/packages/vtiger/optional/RecycleBin.zip b/packages/vtiger/optional/RecycleBin.zip
index b034f74bd12da0a0b0b00cc653b809e8bea41feb..80e38b4951e96da14d3c1dee486b659e260ea4e8 100644
Binary files a/packages/vtiger/optional/RecycleBin.zip and b/packages/vtiger/optional/RecycleBin.zip differ
diff --git a/packages/vtiger/optional/RomanianLanguagePack_rm_rm.zip b/packages/vtiger/optional/RomanianLanguagePack_rm_rm.zip
index acbfff2a3161cf2d551d399f0b2ae59567d60789..403629dad6f39b4ac9c83902e9a9f64b1952e36f 100644
Binary files a/packages/vtiger/optional/RomanianLanguagePack_rm_rm.zip and b/packages/vtiger/optional/RomanianLanguagePack_rm_rm.zip differ
diff --git a/packages/vtiger/optional/Russian.zip b/packages/vtiger/optional/Russian.zip
index 039a3fd5be5b47715e56721a9edc3046739a932b..01a4dc72a7a80cfff53f3b29ec0d3c0d610b246a 100644
Binary files a/packages/vtiger/optional/Russian.zip and b/packages/vtiger/optional/Russian.zip differ
diff --git a/packages/vtiger/optional/SMSNotifier.zip b/packages/vtiger/optional/SMSNotifier.zip
index 6b9a2d68be6f24cd29b5bdbe9d3bb9fc8e9ff8b8..2282d3df3c06b77311385927d6347fcd06395e10 100644
Binary files a/packages/vtiger/optional/SMSNotifier.zip and b/packages/vtiger/optional/SMSNotifier.zip differ
diff --git a/packages/vtiger/optional/Spanish.zip b/packages/vtiger/optional/Spanish.zip
index 907a5e419aa3a685d3baacf302d17259994e7085..cc0b20b35bf8ffd9a89948522be41dca518eaa1a 100644
Binary files a/packages/vtiger/optional/Spanish.zip and b/packages/vtiger/optional/Spanish.zip differ
diff --git a/packages/vtiger/optional/Sweden_sv_se.zip b/packages/vtiger/optional/Sweden_sv_se.zip
index e7f4a3cd0c764c3b126764beb94a6606fb97e5d7..481d0b874f387b5aee0f8340efbc86f995b935ef 100644
Binary files a/packages/vtiger/optional/Sweden_sv_se.zip and b/packages/vtiger/optional/Sweden_sv_se.zip differ
diff --git a/packages/vtiger/optional/TurkishLanguagePack_tr_tr.zip b/packages/vtiger/optional/TurkishLanguagePack_tr_tr.zip
index 553f361b909b6dbf822185757782ba5f04fe8e41..3d59fb9e695b289459f5113ff4d57a85f1fdc630 100644
Binary files a/packages/vtiger/optional/TurkishLanguagePack_tr_tr.zip and b/packages/vtiger/optional/TurkishLanguagePack_tr_tr.zip differ
diff --git a/packages/vtiger/optional/Webforms.zip b/packages/vtiger/optional/Webforms.zip
index 63718e4fc03eba077df5c3d07e5ff2f3bc75b2e5..41d2c5a2d5a52e678694a988e82e40db23c90cb1 100644
Binary files a/packages/vtiger/optional/Webforms.zip and b/packages/vtiger/optional/Webforms.zip differ
diff --git a/pkg/vtiger/modules/ModComments/modules/ModComments/ModCommentsCore.php b/pkg/vtiger/modules/ModComments/modules/ModComments/ModCommentsCore.php
index 738decb29dc495ff85a9a76a44585318358004ab..50a62445758746a0f182c77f1de818a2fdac7bca 100644
--- a/pkg/vtiger/modules/ModComments/modules/ModComments/ModCommentsCore.php
+++ b/pkg/vtiger/modules/ModComments/modules/ModComments/ModCommentsCore.php
@@ -383,6 +383,10 @@ class ModCommentsCore extends CRMEntity {
if ($queryplanner->requireTable("vtiger_modcommentsRelModComments")){
$query .= " left join vtiger_modcomments as vtiger_modcommentsRelModComments on vtiger_modcommentsRelModComments.modcommentsid = vtiger_crmentityModComments.crmid";
}
+
+ //if secondary modules custom reference field is selected
+ $query .= parent::getReportsUiType10Query($secmodule, $queryPlanner);
+
return $query;
}
diff --git a/pkg/vtiger/modules/Projects/ProjectMilestone/modules/ProjectMilestone/ProjectMilestone.php b/pkg/vtiger/modules/Projects/ProjectMilestone/modules/ProjectMilestone/ProjectMilestone.php
index 212618921c381f0bf48fdbf5f296e03bd1c9a737..42991b14f568f18cac1fb7477b48c038e18ce5c4 100644
--- a/pkg/vtiger/modules/Projects/ProjectMilestone/modules/ProjectMilestone/ProjectMilestone.php
+++ b/pkg/vtiger/modules/Projects/ProjectMilestone/modules/ProjectMilestone/ProjectMilestone.php
@@ -432,6 +432,9 @@ class ProjectMilestone extends CRMEntity {
if ($queryPlanner->requireTable("vtiger_createdbyProjectMilestone")){
$query .= " LEFT JOIN vtiger_users AS vtiger_createdbyProjectMilestone ON vtiger_createdbyProjectMilestone.id = vtiger_crmentityProjectMilestone.smcreatorid ";
}
+ //if secondary modules custom reference field is selected
+ $query .= parent::getReportsUiType10Query($secmodule, $queryPlanner);
+
return $query;
}
}
diff --git a/pkg/vtiger/modules/Projects/ProjectTask/modules/ProjectTask/ProjectTask.php b/pkg/vtiger/modules/Projects/ProjectTask/modules/ProjectTask/ProjectTask.php
index ff37ce42fc93e182298095a96ecc3b1fcd5be968..1fea35246a732ecbcc88b8ef889188c6d0f1b1dc 100644
--- a/pkg/vtiger/modules/Projects/ProjectTask/modules/ProjectTask/ProjectTask.php
+++ b/pkg/vtiger/modules/Projects/ProjectTask/modules/ProjectTask/ProjectTask.php
@@ -461,6 +461,9 @@ class ProjectTask extends CRMEntity {
if ($queryPlanner->requireTable("vtiger_createdbyProjectTask")){
$query .= " left join vtiger_users as vtiger_createdbyProjectTask on vtiger_createdbyProjectTask.id = vtiger_crmentityProjectTask.smcreatorid ";
}
+ //if secondary modules custom reference field is selected
+ $query .= parent::getReportsUiType10Query($secmodule, $queryPlanner);
+
return $query;
}
diff --git a/pkg/vtiger/modules/ServiceContracts/modules/ServiceContracts/ServiceContracts.php b/pkg/vtiger/modules/ServiceContracts/modules/ServiceContracts/ServiceContracts.php
index 4f7c12ac1416edf69ba5bb50ce80fe4c3548c194..c799acc8298f2382d880eddb35ed1438721f9586 100644
--- a/pkg/vtiger/modules/ServiceContracts/modules/ServiceContracts/ServiceContracts.php
+++ b/pkg/vtiger/modules/ServiceContracts/modules/ServiceContracts/ServiceContracts.php
@@ -260,6 +260,9 @@ class ServiceContracts extends CRMEntity {
if ($queryplanner->requireTable("vtiger_createdbyServiceContracts")){
$query .= " left join vtiger_users as vtiger_createdbyServiceContracts on vtiger_createdbyServiceContracts.id = vtiger_crmentityServiceContracts.smcreatorid ";
}
+ //if secondary modules custom reference field is selected
+ $query .= parent::getReportsUiType10Query($secmodule, $queryPlanner);
+
return $query;
}
/**
diff --git a/pkg/vtiger/modules/Services/modules/Services/Services.php b/pkg/vtiger/modules/Services/modules/Services/Services.php
index 092a11a9baa9322ba5d7fe92955072ef0f3058b2..969d587438ff461557cae82ae5c6518dadabaee8 100644
--- a/pkg/vtiger/modules/Services/modules/Services/Services.php
+++ b/pkg/vtiger/modules/Services/modules/Services/Services.php
@@ -1057,6 +1057,9 @@ class Services extends CRMEntity {
if ($queryPlanner->requireTable("vtiger_createdbyServices")){
$query .= " left join vtiger_users as vtiger_createdbyServices on vtiger_createdbyServices.id = vtiger_crmentityServices.smcreatorid ";
}
+ //if secondary modules custom reference field is selected
+ $query .= parent::getReportsUiType10Query($secmodule, $queryPlanner);
+
return $query;
}