From 71e7ce63486d2fbe9c6d77b1a3666ef0e8d58ba4 Mon Sep 17 00:00:00 2001
From: Beppo Mazzucato <direzione@beppo.it>
Date: Fri, 12 Nov 2021 11:47:18 +0100
Subject: [PATCH] Fixed query error impacting performances in inventory
---
modules/Accounts/Accounts.php | 4 ++--
modules/Contacts/Contacts.php | 4 ++--
modules/Potentials/Potentials.php | 4 ++--
modules/Products/Products.php | 2 +-
modules/Quotes/Quotes.php | 2 +-
pkg/vtiger/modules/Services/modules/Services/Services.php | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/modules/Accounts/Accounts.php b/modules/Accounts/Accounts.php
index 95c228518..d8ff39235 100644
--- a/modules/Accounts/Accounts.php
+++ b/modules/Accounts/Accounts.php
@@ -756,7 +756,7 @@ class Accounts extends CRMEntity {
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 JOIN vtiger_groups ON vtiger_groups.groupid = vtiger_crmentity.smownerid
- LEFT JOIN vtiger_invoice_recurring_info ON vtiger_invoice_recurring_info.start_period = vtiger_salesorder.salesorderid
+ LEFT JOIN vtiger_invoice_recurring_info ON vtiger_invoice_recurring_info.salesorderid = vtiger_salesorder.salesorderid
LEFT JOIN vtiger_salesordercf ON vtiger_salesordercf.salesorderid = vtiger_salesorder.salesorderid
LEFT JOIN vtiger_sobillads ON vtiger_sobillads.sobilladdressid = vtiger_salesorder.salesorderid
LEFT JOIN vtiger_soshipads ON vtiger_soshipads.soshipaddressid = vtiger_salesorder.salesorderid
@@ -1753,4 +1753,4 @@ class Accounts extends CRMEntity {
}
}
-?>
\ No newline at end of file
+?>
diff --git a/modules/Contacts/Contacts.php b/modules/Contacts/Contacts.php
index fe9342546..0195063dc 100644
--- a/modules/Contacts/Contacts.php
+++ b/modules/Contacts/Contacts.php
@@ -630,7 +630,7 @@ class Contacts extends CRMEntity {
$userNameSql = getSqlForNameInDisplayFormat(array('first_name'=>
'vtiger_users.first_name', 'last_name' => 'vtiger_users.last_name'), 'Users');
- $query = "select case when (vtiger_users.user_name not like '') then $userNameSql 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_salesordercf ON vtiger_salesordercf.salesorderid = vtiger_salesorder.salesorderid LEFT JOIN vtiger_sobillads ON vtiger_sobillads.sobilladdressid = vtiger_salesorder.salesorderid LEFT JOIN vtiger_soshipads ON vtiger_soshipads.soshipaddressid = 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 JOIN vtiger_invoice_recurring_info ON vtiger_invoice_recurring_info.start_period = vtiger_salesorder.salesorderid left outer join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_salesorder.contactid left join vtiger_groups on vtiger_groups.groupid=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 and vtiger_salesorder.contactid = ".$id;
+ $query = "select case when (vtiger_users.user_name not like '') then $userNameSql 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_salesordercf ON vtiger_salesordercf.salesorderid = vtiger_salesorder.salesorderid LEFT JOIN vtiger_sobillads ON vtiger_sobillads.sobilladdressid = vtiger_salesorder.salesorderid LEFT JOIN vtiger_soshipads ON vtiger_soshipads.soshipaddressid = 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 JOIN vtiger_invoice_recurring_info ON vtiger_invoice_recurring_info.salesorderid = vtiger_salesorder.salesorderid left outer join vtiger_contactdetails on vtiger_contactdetails.contactid=vtiger_salesorder.contactid left join vtiger_groups on vtiger_groups.groupid=vtiger_crmentity.smownerid where vtiger_crmentity.deleted=0 and vtiger_salesorder.contactid = ".$id;
$return_value = GetRelatedList($this_module, $related_module, $other, $query, $button, $returnset);
@@ -1616,4 +1616,4 @@ function get_contactsforol($user_name)
}
-?>
\ No newline at end of file
+?>
diff --git a/modules/Potentials/Potentials.php b/modules/Potentials/Potentials.php
index 76108adab..128aeee76 100644
--- a/modules/Potentials/Potentials.php
+++ b/modules/Potentials/Potentials.php
@@ -586,7 +586,7 @@ class Potentials extends CRMEntity {
left outer join vtiger_potential on vtiger_potential.potentialid=vtiger_salesorder.potentialid
left join vtiger_groups on vtiger_groups.groupid=vtiger_crmentity.smownerid
LEFT JOIN vtiger_salesordercf ON vtiger_salesordercf.salesorderid = vtiger_salesorder.salesorderid
- LEFT JOIN vtiger_invoice_recurring_info ON vtiger_invoice_recurring_info.start_period = vtiger_salesorder.salesorderid
+ LEFT JOIN vtiger_invoice_recurring_info ON vtiger_invoice_recurring_info.salesorderid = vtiger_salesorder.salesorderid
LEFT JOIN vtiger_sobillads ON vtiger_sobillads.sobilladdressid = vtiger_salesorder.salesorderid
LEFT JOIN vtiger_soshipads ON vtiger_soshipads.soshipaddressid = vtiger_salesorder.salesorderid
left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid
@@ -837,4 +837,4 @@ class Potentials extends CRMEntity {
}
}
-?>
\ No newline at end of file
+?>
diff --git a/modules/Products/Products.php b/modules/Products/Products.php
index 386a2da03..9388bceae 100755
--- a/modules/Products/Products.php
+++ b/modules/Products/Products.php
@@ -816,7 +816,7 @@ class Products extends CRMEntity {
LEFT JOIN vtiger_salesordercf
ON vtiger_salesordercf.salesorderid = vtiger_salesorder.salesorderid
LEFT JOIN vtiger_invoice_recurring_info
- ON vtiger_invoice_recurring_info.start_period = vtiger_salesorder.salesorderid
+ ON vtiger_invoice_recurring_info.salesorderid = vtiger_salesorder.salesorderid
LEFT JOIN vtiger_sobillads
ON vtiger_sobillads.sobilladdressid = vtiger_salesorder.salesorderid
LEFT JOIN vtiger_soshipads
diff --git a/modules/Quotes/Quotes.php b/modules/Quotes/Quotes.php
index 86056c5aa..21435be09 100755
--- a/modules/Quotes/Quotes.php
+++ b/modules/Quotes/Quotes.php
@@ -169,7 +169,7 @@ class Quotes extends CRMEntity {
left outer join vtiger_account on vtiger_account.accountid=vtiger_salesorder.accountid
left join vtiger_groups on vtiger_groups.groupid=vtiger_crmentity.smownerid
LEFT JOIN vtiger_salesordercf ON vtiger_salesordercf.salesorderid = vtiger_salesorder.salesorderid
- LEFT JOIN vtiger_invoice_recurring_info ON vtiger_invoice_recurring_info.start_period = vtiger_salesorder.salesorderid
+ LEFT JOIN vtiger_invoice_recurring_info ON vtiger_invoice_recurring_info.salesorderid = vtiger_salesorder.salesorderid
LEFT JOIN vtiger_sobillads ON vtiger_sobillads.sobilladdressid = vtiger_salesorder.salesorderid
LEFT JOIN vtiger_soshipads ON vtiger_soshipads.soshipaddressid = vtiger_salesorder.salesorderid
left join vtiger_users on vtiger_users.id=vtiger_crmentity.smownerid
diff --git a/pkg/vtiger/modules/Services/modules/Services/Services.php b/pkg/vtiger/modules/Services/modules/Services/Services.php
index 969d58743..baec86cfa 100644
--- a/pkg/vtiger/modules/Services/modules/Services/Services.php
+++ b/pkg/vtiger/modules/Services/modules/Services/Services.php
@@ -655,7 +655,7 @@ class Services extends CRMEntity {
LEFT OUTER JOIN vtiger_account
ON vtiger_account.accountid = vtiger_salesorder.accountid
LEFT JOIN vtiger_invoice_recurring_info
- ON vtiger_invoice_recurring_info.start_period = vtiger_salesorder.salesorderid
+ ON vtiger_invoice_recurring_info.salesorderid = vtiger_salesorder.salesorderid
LEFT JOIN vtiger_groups
ON vtiger_groups.groupid = vtiger_crmentity.smownerid
LEFT JOIN vtiger_salesordercf
--
GitLab