Skip to content

Commit

Permalink
FIX #10460 compatibility with MariaDB 10.4
Browse files Browse the repository at this point in the history
  • Loading branch information
david authored and eldy committed Sep 9, 2019
1 parent c9a62b0 commit ac539d2
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions htdocs/core/class/html.form.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -1152,9 +1152,8 @@ public function select_thirdparty_list($selected = '', $htmlname = 'socid', $fil
$sql .= ", dictp.code as country_code";
}

$sql.= " FROM (".MAIN_DB_PREFIX ."societe as s";
$sql.= " FROM ".MAIN_DB_PREFIX ."societe as s";
if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " )";
if ($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST) {
$sql.= " LEFT OUTER JOIN ".MAIN_DB_PREFIX."c_country as dictp ON dictp.rowid=s.fk_pays";
}
Expand Down

0 comments on commit ac539d2

Please sign in to comment.