Merge pull request #1681 from KreizIT/FIX1485

FIX #1485:LINEBILL_SUPPLIER_DELETE failure trigger leads to an endless
Dolibarr · Jun 23, 2014 · 04ead87 · 04ead87
2 parents b4add02 + 7ced580
commit 04ead87
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -37,6 +37,7 @@ Fix: [ bug #1254 ] Error when using "Enter" on qty input box of a product (on su
 Fix: [ bug #1462, 1468, 1480, 1483, 1490, 1497] $this instead of $object
 Fix: [ bug #1455 ] outstanding amount
 Fix: [ bug #1425 ]
+Fix: [ bug #1425 ] LINEBILL_SUPPLIER_DELETE failure trigger leads to an endless loop
 
 ***** ChangeLog for 3.5.3 compared to 3.5.2 *****
 Fix: Error on field accountancy code for export profile of invoices.

diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php
@@ -179,6 +179,8 @@
 	else
 	{
 		$mesg='<div class="error">'.$object->error.'</div>';
+		/* Fix bug 1485 : Reset action to avoid asking again confirmation on failure */
+		$action='';
 	}
 }