Merge branch 'fappels-3.5' into 3.5

Dolibarr · Jun 20, 2014 · ab2e88b · ab2e88b
2 parents 221d7b5 + 1cffc8d
commit ab2e88b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -22,6 +22,7 @@ Fix: [ bug #1451 ] Interrupted order clone through trigger, loads nonexistent or
 Fix: [ bug #1454 ] Mention de bas de page erroné
 Fix: Do not display dictionnay for non activated module 
 Fix: Link element from element project pages
+Fix: [ bug #1509 ] Expedition admin free text & watermark submit error
 
 ***** 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/admin/expedition.php b/htdocs/admin/expedition.php
@@ -76,7 +76,7 @@
 	$freetext=GETPOST('SHIPPING_FREE_TEXT','alpha');
 	$res = dolibarr_set_const($db, "SHIPPING_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
 
-	if ($res < 0)
+	if ($res > 0)
 		setEventMessage($langs->trans("SetupSaved"));
 	else
 		setEventMessage($langs->trans("Error"), 'errors');
@@ -87,7 +87,7 @@
 	$draft=GETPOST('SHIPPING_DRAFT_WATERMARK','alpha');
 	$res = dolibarr_set_const($db, "SHIPPING_DRAFT_WATERMARK",trim($draft),'chaine',0,'',$conf->entity);
 
-	if ($res < 0)
+	if ($res > 0)
 		setEventMessage($langs->trans("SetupSaved"));
 	else
 		setEventMessage($langs->trans("Error"), 'errors');