LEFT JOIN syntax
This commit is contained in:
parent
cd43d46006
commit
924204ac29
7 changed files with 13 additions and 13 deletions
|
|
@ -543,7 +543,7 @@ class AdvanceTargetingMailing extends CommonObject
|
|||
$sql = "SELECT";
|
||||
$sql .= " t.rowid";
|
||||
$sql .= " FROM ".MAIN_DB_PREFIX."societe as t";
|
||||
$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."societe_extrafields as te ON te.fk_object=t.rowid ";
|
||||
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_extrafields as te ON te.fk_object=t.rowid ";
|
||||
|
||||
$sqlwhere = array();
|
||||
|
||||
|
|
@ -719,11 +719,11 @@ class AdvanceTargetingMailing extends CommonObject
|
|||
$sql = "SELECT";
|
||||
$sql .= " t.rowid";
|
||||
$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as t";
|
||||
$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."socpeople_extrafields as te ON te.fk_object=t.rowid ";
|
||||
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople_extrafields as te ON te.fk_object=t.rowid ";
|
||||
|
||||
if (!empty($withThirdpartyFilter)) {
|
||||
$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."societe as ts ON ts.rowid=t.fk_soc";
|
||||
$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."societe_extrafields as tse ON tse.fk_object=ts.rowid ";
|
||||
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as ts ON ts.rowid=t.fk_soc";
|
||||
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_extrafields as tse ON tse.fk_object=ts.rowid ";
|
||||
}
|
||||
|
||||
$sqlwhere = array();
|
||||
|
|
@ -732,7 +732,7 @@ class AdvanceTargetingMailing extends CommonObject
|
|||
|
||||
if (count($arrayquery) > 0) {
|
||||
if (array_key_exists('contact_categ', $arrayquery)) {
|
||||
$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_contact as contactcateg ON contactcateg.fk_socpeople=t.rowid ";
|
||||
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_contact as contactcateg ON contactcateg.fk_socpeople=t.rowid ";
|
||||
}
|
||||
|
||||
if (!empty($arrayquery['contact_lastname'])) {
|
||||
|
|
|
|||
|
|
@ -288,7 +288,7 @@ if ($modecompta == 'CREANCES-DETTES') {
|
|||
$sql .= " sum(f.total_ht) as amount, sum(f.total_ttc) as amount_ttc";
|
||||
$sql .= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s";
|
||||
if ($selected_cat === -2) { // Without any category
|
||||
$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
|
||||
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
|
||||
} elseif ($selected_cat) { // Into a specific category
|
||||
$sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs";
|
||||
}
|
||||
|
|
@ -323,7 +323,7 @@ if ($modecompta == 'CREANCES-DETTES') {
|
|||
$sql .= ", ".MAIN_DB_PREFIX."paiement as p";
|
||||
$sql .= ", ".MAIN_DB_PREFIX."societe as s";
|
||||
if ($selected_cat === -2) { // Without any category
|
||||
$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
|
||||
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON s.rowid = cs.fk_soc";
|
||||
} elseif ($selected_cat) { // Into a specific category
|
||||
$sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_societe as cs";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -314,7 +314,7 @@ if ($modecompta == 'CREANCES-DETTES') {
|
|||
$sql .= " sum(f.total_ht) as amount, sum(f.total_ttc) as amount_ttc";
|
||||
$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f, ".MAIN_DB_PREFIX."societe as s";
|
||||
if ($selected_cat === -2) { // Without any category
|
||||
$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_fournisseur as cs ON s.rowid = cs.fk_soc";
|
||||
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_fournisseur as cs ON s.rowid = cs.fk_soc";
|
||||
} elseif ($selected_cat) { // Into a specific category
|
||||
$sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_fournisseur as cs";
|
||||
}
|
||||
|
|
@ -341,7 +341,7 @@ if ($modecompta == 'CREANCES-DETTES') {
|
|||
$sql .= ", ".MAIN_DB_PREFIX."paiementfourn as p";
|
||||
$sql .= ", ".MAIN_DB_PREFIX."societe as s";
|
||||
if ($selected_cat === -2) { // Without any category
|
||||
$sql .= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."categorie_fournisseur as cs ON s.rowid = cs.fk_soc";
|
||||
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_fournisseur as cs ON s.rowid = cs.fk_soc";
|
||||
} elseif ($selected_cat) { // Into a specific category
|
||||
$sql .= ", ".MAIN_DB_PREFIX."categorie as c, ".MAIN_DB_PREFIX."categorie_fournisseur as cs";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1826,7 +1826,7 @@ class Form
|
|||
}
|
||||
$sql .= " FROM " . $this->db->prefix() . "socpeople as sp";
|
||||
if ($showsoc > 0 || getDolGlobalString('CONTACT_SHOW_EMAIL_PHONE_TOWN_SELECTLIST')) {
|
||||
$sql .= " LEFT OUTER JOIN " . $this->db->prefix() . "societe as s ON s.rowid=sp.fk_soc";
|
||||
$sql .= " LEFT JOIN " . $this->db->prefix() . "societe as s ON s.rowid=sp.fk_soc";
|
||||
}
|
||||
$sql .= " WHERE sp.entity IN (" . getEntity('contact') . ")";
|
||||
$sql .= " AND ((sp.fk_user_creat = ".((int) $user->id)." AND sp.priv = 1) OR sp.priv = 0)"; // check if this is a private contact
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ class mailing_advthirdparties extends MailingTargets
|
|||
// Select the third parties from category
|
||||
if (count($socid) > 0) {
|
||||
$sql = "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact";
|
||||
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s LEFT OUTER JOIN ".MAIN_DB_PREFIX."societe_extrafields se ON se.fk_object=s.rowid";
|
||||
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s LEFT JOIN ".MAIN_DB_PREFIX."societe_extrafields se ON se.fk_object=s.rowid";
|
||||
$sql .= " WHERE s.entity IN (".getEntity('societe').")";
|
||||
$sql .= " AND s.rowid IN (".$this->db->sanitize(implode(',', $socid)).")";
|
||||
if (empty($this->evenunsubscribe)) {
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ class CdavLib
|
|||
s.phone soc_phone,
|
||||
ac.sourceuid,
|
||||
(SELECT GROUP_CONCAT(u.login) FROM '.MAIN_DB_PREFIX.'actioncomm_resources ar
|
||||
LEFT OUTER JOIN '.MAIN_DB_PREFIX.'user AS u ON (u.rowid=fk_element)
|
||||
LEFT JOIN '.MAIN_DB_PREFIX.'user AS u ON (u.rowid=fk_element)
|
||||
WHERE ar.element_type=\'user\' AND fk_actioncomm=a.id) AS other_users
|
||||
FROM '.MAIN_DB_PREFIX.'actioncomm AS a';
|
||||
$sql .= " LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON co.rowid = sp.fk_pays
|
||||
|
|
|
|||
|
|
@ -2186,7 +2186,7 @@ class Holiday extends CommonObject
|
|||
public function countActiveUsersWithoutCP()
|
||||
{
|
||||
$sql = "SELECT count(u.rowid) as compteur";
|
||||
$sql .= " FROM ".MAIN_DB_PREFIX."user as u LEFT OUTER JOIN ".MAIN_DB_PREFIX."holiday_users hu ON (hu.fk_user=u.rowid)";
|
||||
$sql .= " FROM ".MAIN_DB_PREFIX."user as u LEFT JOIN ".MAIN_DB_PREFIX."holiday_users hu ON (hu.fk_user=u.rowid)";
|
||||
$sql .= " WHERE u.statut > 0 AND hu.fk_user IS NULL";
|
||||
|
||||
$result = $this->db->query($sql);
|
||||
|
|
|
|||
Loading…
Reference in a new issue