From 72effa3f25b2e6495ee7893c59ef53bb787a2c1c Mon Sep 17 00:00:00 2001
From: fhenry <florian.henry@open-concept.pro>
Date: Fri, 15 Mar 2013 09:31:11 +0100
Subject: [PATCH] Fix part of bugs [ bug #766 ]
---
htdocs/admin/expedition.php | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index 709832b1968..2349053f46f 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -65,9 +65,9 @@ if ($action == 'updateMask')
if (isset($res))
{
if ($res < 0)
- setEventMessage($langs->trans("SetupSaved"));
- else
setEventMessage($langs->trans("Error"), 'errors');
+ else
+ setEventMessage($langs->trans("SetupSaved"));
}
}
@@ -77,9 +77,9 @@ else if ($action == 'set_SHIPPING_FREE_TEXT')
$res = dolibarr_set_const($db, "SHIPPING_FREE_TEXT",$freetext,'chaine',0,'',$conf->entity);
if ($res < 0)
- setEventMessage($langs->trans("SetupSaved"));
- else
setEventMessage($langs->trans("Error"), 'errors');
+ else
+ setEventMessage($langs->trans("SetupSaved"));
}
else if ($action == 'set_SHIPPING_DRAFT_WATERMARK')
@@ -88,9 +88,9 @@ else if ($action == 'set_SHIPPING_DRAFT_WATERMARK')
$res = dolibarr_set_const($db, "SHIPPING_DRAFT_WATERMARK",trim($draft),'chaine',0,'',$conf->entity);
if ($res < 0)
- setEventMessage($langs->trans("SetupSaved"));
- else
setEventMessage($langs->trans("Error"), 'errors');
+ else
+ setEventMessage($langs->trans("SetupSaved"));
}
else if ($action == 'specimen')
@@ -173,7 +173,12 @@ else if ($action == 'setdoc')
else if ($action == 'setmodel')
{
- dolibarr_set_const($db, "EXPEDITION_ADDON_NUMBER",$value,'chaine',0,'',$conf->entity);
+ $res = dolibarr_set_const($db, "EXPEDITION_ADDON_NUMBER",$value,'chaine',0,'',$conf->entity);
+
+ if ($res < 0)
+ setEventMessage($langs->trans("Error"), 'errors');
+ else
+ setEventMessage($langs->trans("SetupSaved"));
}
--
GitLab