Merge pull request #11805 from simnandez/10.0

FIX #11804 list of tickets from a customer card display ALL tickets
Dolibarr · Sep 3, 2019 · 19f9d03 · 19f9d03
2 parents 931380c + b45d3ea
commit 19f9d03
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2013-2018	Jean-François FERRY	<hello@librethic.io>
  * Copyright (C) 2016		Christophe Battarel	<christophe@altairis.fr>
  * Copyright (C) 2018		Regis Houssin		<regis.houssin@inodbox.com>
+ * Copyright (C) 2019		Juanjo Menent		<jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -210,6 +211,11 @@
 if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
 $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON (t.fk_soc = s.rowid)";
 $sql.= " WHERE t.entity IN (".getEntity($object->element).")";
+if ($socid > 0)
+{
+	$sql.= " AND t.fk_soc = ".$socid;
+}
+
 foreach($search as $key => $val)
 {
     if ($key == 'fk_statut')