diff --git a/htdocs/expedition/class/api_shipments.class.php b/htdocs/expedition/class/api_shipments.class.php
index 452ac88c494..a07eb74ee12 100644
--- a/htdocs/expedition/class/api_shipments.class.php
+++ b/htdocs/expedition/class/api_shipments.class.php
@@ -203,10 +203,10 @@ class Shipments extends DolibarrApi
 				$shipmentline = new ExpeditionLigne($this->db);
 
 				$shipmentline->entrepot_id = $line->entrepot_id;
-				$shipmentline->fk_element = $this->origin_id;			// example: order id.  this->origin is 'commande'
+				$shipmentline->fk_element = $line->origin_id;			// example: order id.  this->origin is 'commande'
 				$shipmentline->origin_line_id = $line->origin_line_id;		// example: order id
 				$shipmentline->fk_elementdet = $line->origin_line_id;	// example: order line id
-				$shipmentline->element_type = $this->origin_type;		// example 'commande' or 'order'
+				$shipmentline->element_type = $line->origin_type;		// example 'commande' or 'order'
 				$shipmentline->qty = $line->qty;
 				$shipmentline->rang = $line->rang;
 				$shipmentline->array_options = $line->array_options;
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 722621130fb..0841aac2d8c 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -1450,7 +1450,6 @@ class User extends CommonObject
 	 *	@return	void
 	 *
 	 *  @see	clearrights(), delrights(), addrights(), hasRight()
-	 *  @deprecated Use instead loadRights()
 	 *  @phpstan-ignore-next-line
 	 */
 	public function getrights($moduletag = '', $forcereload = 0)