Merge branch '18.0' of [email protected]:Dolibarr/dolibarr.git into 19.0

f-hoedl · Feb 19, 2024 · 43996ff · 43996ff
2 parents 3e8ee34 + 7117ec5
commit 43996ff
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
@@ -71,7 +71,7 @@ function societe_prepare_head(Societe $object)
 				$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
 				$sql .= $hookmanager->resPrint;
 				$sql .= " WHERE p.fk_soc = ".((int) $object->id);
-				$sql .= " AND entity IN (".getEntity($object->element).")";
+				$sql .= " AND p.entity IN (".getEntity($object->element).")";
 				// Add where from hooks
 				$parameters = array('contacttab' => true);
 				$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook

diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
@@ -2107,9 +2107,9 @@
 			$line->fetch_optionals();
 
 			if ($action == 'editline' && $lines[$i]->id == $line_id) {
-				print $line->showOptionals($extrafields, 'edit', array('colspan'=>$colspan), $indiceAsked);
+				print $line->showOptionals($extrafields, 'edit', array('colspan'=>$colspan), '');
 			} else {
-				print $line->showOptionals($extrafields, 'view', array('colspan'=>$colspan), $indiceAsked);
+				print $line->showOptionals($extrafields, 'view', array('colspan'=>$colspan), '');
 			}
 		}
 	}