Browse Source

fix: when COMPANY_SHOW_ADDRESS_SELECTLIST is 1 ajax call to company.php is broken

Florian HENRY 3 years ago
parent
commit
c66181a00e
2 changed files with 5 additions and 3 deletions
  1. 1 1
      htdocs/core/class/html.form.class.php
  2. 4 2
      htdocs/societe/ajax/company.php

+ 1 - 1
htdocs/core/class/html.form.class.php

@@ -1359,7 +1359,7 @@ class Form
 			$sql .= " AND s.status <> 0";
 		}
 		if (!empty($excludeids)) {
-			$sql .= " AND rowid NOT IN (".$this->db->sanitize(join(',', $excludeids)).")";
+			$sql .= " AND s.rowid NOT IN (".$this->db->sanitize(join(',', $excludeids)).")";
 		}
 		// Add criteria
 		if ($filterkey && $filterkey != '') {

+ 4 - 2
htdocs/societe/ajax/company.php

@@ -119,10 +119,12 @@ if (!empty($action) && $action == 'fetch' && !empty($id)) {
 	}
 
 	if (!empty($excludeids)) {
-		$filter .= 'rowid NOT IN ('.$db->sanitize($excludeids).')';
+		$excludeids = explode(',', $excludeids);
+	} else {
+		$excludeids = array();
 	}
 
-	$arrayresult = $form->select_thirdparty_list(0, $htmlname, $filter, 1, $showtype, 0, null, $searchkey, $outjson);
+	$arrayresult = $form->select_thirdparty_list(0, $htmlname, $filter, 1, $showtype, 0, null, $searchkey, $outjson, 0, 'minwidth100', '', false, $excludeids);
 
 	$db->close();