diff --git a/htdocs/comm/adresse_livraison.php b/htdocs/comm/adresse_livraison.php index e880b64a3c2..707a2ce4b09 100644 --- a/htdocs/comm/adresse_livraison.php +++ b/htdocs/comm/adresse_livraison.php @@ -50,9 +50,10 @@ $result = restrictedArea($user, 'societe', $socid); if ($_POST["action"] == 'add' || $_POST["action"] == 'update') { $livraison = new AdresseLivraison($db); + $livraison->socid = $_POST["socid"]; - $livraison->label = $_POST["label"]; - $livraison->nom = $_POST["nom"]; + $livraison->label = ($_POST["label"]!=$langs->trans('RequiredField')?$_POST["label"]:''); + $livraison->nom = ($_POST["nom"]!=$langs->trans('RequiredField')?$_POST["nom"]:''); $livraison->adresse = $_POST["adresse"]; $livraison->cp = $_POST["cp"]; $livraison->ville = $_POST["ville"]; diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php index 1a3f4973488..3de6be90138 100644 --- a/htdocs/lib/functions.lib.php +++ b/htdocs/lib/functions.lib.php @@ -3146,16 +3146,16 @@ function addHelpMessage($inputId,$message) { global $conf; - $tempMessage = ''; + $helpMessage = ''; if ($conf->use_javascript_ajax) { - $tempMessage.= 'style="color: grey;" '; - $tempMessage.= 'onFocus="hideMessage(\''.$inputId.'\',\''.$message.'\');" '; - $tempMessage.= 'onBlur="displayMessage(\''.$inputId.'\',\''.$message.'\');"'; + $helpMessage.= 'style="color: grey;" '; + $helpMessage.= 'onFocus="hideMessage(\''.$inputId.'\',\''.$message.'\');" '; + $helpMessage.= 'onBlur="displayMessage(\''.$inputId.'\',\''.$message.'\');"'; } - return $tempMessage; + return $helpMessage; } ?> \ No newline at end of file