diff --git a/ChangeLog b/ChangeLog
index 2376592a12f..9432bdea4d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,7 @@ Following changes may create regressions for some external modules, but were nec
 * Trigger ORDER_SUPPLIER_DISPATCH is removed, use ORDER_SUPPLIER_RECEIVE and/or LINEORDER_SUPPLIER_DISPATCH instead.
 * All functions fetch_all() are deprecated for naming consitency, use fetchAll() instead
 * Code standardization: $user->rights->propale is now $user->rights->propal everywhere.
+* Deprecated method set_billed() on shipment and reception class has been removed. Use setBilled() instead.
 
 
 ***** ChangeLog for 16.0.1 compared to 16.0.0 *****
diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php
index 2e3473d4a99..675815f1dbb 100644
--- a/htdocs/admin/workflow.php
+++ b/htdocs/admin/workflow.php
@@ -152,14 +152,6 @@ $workflowcodes = array(
 		'warning'=>''
 	),
 
-	// Automatic classification reception
-	'WORKFLOW_BILL_ON_RECEPTION'=>array(
-		'family'=>'classify_reception',
-		'position'=>80,
-		'enabled'=>(isModEnabled("reception") && ((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled("supplier_order") || isModEnabled("supplier_invoice"))),
-		'picto'=>'reception'
-	),
-
 	// Automatic classification shipping
 	'WORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE' => array(
 		'family' => 'classify_shipping',
@@ -168,6 +160,14 @@ $workflowcodes = array(
 		'picto' => 'shipment'
 	),
 
+	// Automatic classification reception
+	'WORKFLOW_BILL_ON_RECEPTION'=>array(
+		'family'=>'classify_reception',
+		'position'=>95,
+		'enabled'=>(isModEnabled("reception") && ((isModEnabled("fournisseur") && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled("supplier_order") || isModEnabled("supplier_invoice"))),
+		'picto'=>'reception'
+	),
+
 	'separator2'=>array('family'=>'separator', 'position'=>400, 'enabled' => (isModEnabled('ticket') && isModEnabled('contract'))),
 
 	// Automatic link ticket -> contract
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 82ba1d36040..d3981dcf264 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -2243,21 +2243,6 @@ class Expedition extends CommonObject
 		}
 	}
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *	Classify the shipping as invoiced (used when WORKFLOW_BILL_ON_SHIPMENT is on)
-	 *
-	 *	@deprecated
-	 *  @see setBilled()
-	 *	@return     int     <0 if ko, >0 if ok
-	 */
-	public function set_billed()
-	{
-		// phpcs:enable
-		dol_syslog(get_class($this)."::set_billed is deprecated, use setBilled instead", LOG_NOTICE);
-		return $this->setBilled();
-	}
-
 	/**
 	 *	Classify the shipping as invoiced (used when WORKFLOW_BILL_ON_SHIPMENT is on)
 	 *
diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php
index 47b4bcdeb0d..912f2cae93f 100644
--- a/htdocs/reception/class/reception.class.php
+++ b/htdocs/reception/class/reception.class.php
@@ -1641,21 +1641,6 @@ class Reception extends CommonObject
 		}
 	}
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *	Classify the reception as invoiced (used when WORKFLOW_BILL_ON_RECEPTION is on)
-	 *
-	 *	@deprecated
-	 *  @see setBilled()
-	 *	@return     int     <0 if ko, >0 if ok
-	 */
-	public function set_billed()
-	{
-		// phpcs:enable
-		dol_syslog(get_class($this)."::set_billed is deprecated, use setBilled instead", LOG_NOTICE);
-		return $this->setBilled();
-	}
-
 	/**
 	 *	Classify the reception as invoiced (used when WORKFLOW_BILL_ON_RECEPTION is on)
 	 *