diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php
index 9af07ec5e5c..33f16d98a7b 100755
--- a/htdocs/admin/workflow.php
+++ b/htdocs/admin/workflow.php
@@ -78,9 +78,9 @@ clearstatcache();
 
 $workflowcodes=array(
 	'WORKFLOW_PROPAL_AUTOCREATE_ORDER'=>array('enabled'=>($conf->propal->enabled && $conf->commande->enabled), 'picto'=>'order'),
-	'WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL'=>array('enabled'=>($conf->propal->enabled && $conf->commande->enabled), 'picto'=>'order'),
+	'WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL'=>array('enabled'=>($conf->propal->enabled && $conf->commande->enabled), 'picto'=>'order','warning'=>'WarningCloseAlways'),
 	'WORKFLOW_ORDER_AUTOCREATE_INVOICE'=>array('enabled'=>($conf->commande->enabled && $conf->facture->enabled), 'picto'=>'bill'),
-	'WORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER'=>array('enabled'=>($conf->facture->enabled && $conf->commande->enabled), 'picto'=>'bill'),
+	'WORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER'=>array('enabled'=>($conf->facture->enabled && $conf->commande->enabled), 'picto'=>'bill','warning'=>'WarningCloseAlways'),
 );
 
 if (! empty($conf->modules_parts['workflow']) && is_array($conf->modules_parts['workflow'])) $workflow = array_merge($workflow, $conf->modules_parts['workflow']);
@@ -96,7 +96,13 @@ foreach($workflowcodes as $key => $tmparray)
    	$nbqualified++;
 	$var = !$var;
    	print "<tr ".$bc[$var].">\n";
-   	print "<td>".img_object('', $picto).$langs->trans('desc'.$key)."</td>\n";
+   	print "<td>".img_object('', $picto).$langs->trans('desc'.$key);
+   	if (! empty($tmparray['warning']))
+   	{
+   		$langs->load("errors");
+   		print ' '.img_warning($langs->transnoentitiesnoconv($tmparray['warning']));
+   	}
+   	print "</td>\n";
    	print '<td align="center">';
    	if ($conf->use_javascript_ajax)
    	{
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 1070f9b53e0..f201e2696de 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -121,4 +121,5 @@ WarningConfFileMustBeReadOnly=Warning, your config file (<b>htdocs/conf/conf.php
 WarningsOnXLines=Warnings on <b>%s</b> source lines
 WarningNoDocumentModelActivated=No model, for document generation, has been activated. A model will be choosed by default until you check your module setup.
 WarningLockFileDoesNotExists=Warning, once setup is finished, you must disable install/migrate tools by adding a file <b>install.lock</b> into directory <b>%s</b>. Missing this file is a security hole. 
-WarningUntilDirRemoved=All security warnings (visible by admin users only) will remain active as long as the vulnerability is present (or that constant MAIN_REMOVE_INSTALL_WARNING is added in Setup->Other setup).
\ No newline at end of file
+WarningUntilDirRemoved=All security warnings (visible by admin users only) will remain active as long as the vulnerability is present (or that constant MAIN_REMOVE_INSTALL_WARNING is added in Setup->Other setup).
+WarningCloseAlways=Warning, closing is done even if amount differs between source and target elements. Enable this feature with caution.
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index e883796967c..35eeeeacfde 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -122,4 +122,5 @@ WarningConfFileMustBeReadOnly=Attention, votre fichier de configuration (<b>htdo
 WarningsOnXLines=Alertes sur <b>%s</b> lignes sources
 WarningNoDocumentModelActivated=Aucun modèle, pour la génération de document, n'a été activé. Un modèle sera pris par défaut en attendant la correction de configuration du module.
 WarningLockFileDoesNotExists=Attention, une fois l'installation terminée, les outils d'installation/migration doivent être désactivés en ajoutant un fichier <b>install.lock</b> dans le répertoire <b>%s</b>. L'absence de ce fichier représente une faille de sécurité. 
-WarningUntilDirRemoved=Les alertes de sécurité sont visibles par les administrateurs uniquement et resteront actives tant que la vulnérabilité sera avérée (ou que la constante MAIN_REMOVE_INSTALL_WARNING aura été définie dans Configuration->Divers)
\ No newline at end of file
+WarningUntilDirRemoved=Les alertes de sécurité sont visibles par les administrateurs uniquement et resteront actives tant que la vulnérabilité sera avérée (ou que la constante MAIN_REMOVE_INSTALL_WARNING aura été définie dans Configuration->Divers)
+WarningCloseAlways=Attention, la fermeture se fait même lorsque le montant diffère. N'activez cette fonctionnalité qu'en connaissance de cause.
\ No newline at end of file
diff --git a/test/soapui/Dolibarr-soapui-project.xml b/test/soapui/Dolibarr-soapui-project.xml
index d5669969a4d..e4ee685dc2e 100755
--- a/test/soapui/Dolibarr-soapui-project.xml
+++ b/test/soapui/Dolibarr-soapui-project.xml
@@ -264,7 +264,7 @@
             <date_creation xsi:type="xsd:dateTime">2012-01-01</date_creation>
             <date_validation xsi:type="xsd:dateTime">2012-01-01</date_validation>
             <date_modification xsi:type="xsd:dateTime">2012-01-01</date_modification>
-            <type xsi:type="xsd:int">1</type>
+            <type xsi:type="xsd:int">0</type>
             <total_net xsi:type="xsd:double">?</total_net>
             <total_vat xsi:type="xsd:double">?</total_vat>
             <total xsi:type="xsd:double">?</total>