diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php index 089533433baa15fd863bc5f8b183a2d13e3a4c71..d0ffd822df34b07b764a82f6b73eb76b6ea72819 100644 --- a/htdocs/admin/dict.php +++ b/htdocs/admin/dict.php @@ -224,9 +224,16 @@ if ($_GET["action"] == 'delete') // delete $sql = "DELETE from ".$tabname[$_GET["id"]]." WHERE $rowidcol='".$_GET["rowid"]."'"; $result = $db->query($sql); - if (!$result) + if (! $result) { - dolibarr_print_error($db); + if ($db->errno() == 'DB_ERROR_CHILD_EXISTS') + { + $msg='<div class="error">'.$langs->trans("ErrorRecordIsUsedByChild").'</div>'; + } + else + { + dolibarr_print_error($db); + } } } diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang index 3686a474933fa320a462df4a0d49b06ec157e99a..153da598291136ba1839b850ab6a57c9c9c70b1e 100644 --- a/htdocs/langs/en_US/main.lang +++ b/htdocs/langs/en_US/main.lang @@ -19,6 +19,7 @@ ErrorInternalErrorDetected=Internal error detected ErrorNoRequestRan=No request ran ErrorWrongHostParameter=Wrong host parameter ErrorYourCountryIsNotDefined=Your country is not defined. Go to Home-Setup-Edit and post again the form. +ErrorRecordIsUsedByChild=Failed to delete this record. This record is used by at least on child records. HomeArea=Home area LastAccess=Last access RequestedUrl=Requested Url diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang index d8e4ef03a56da2a682942536ff26d95cd0618e2b..6ca8ffe86c0b1b274056c40bbbb12fde8e08788e 100644 --- a/htdocs/langs/fr_FR/main.lang +++ b/htdocs/langs/fr_FR/main.lang @@ -19,6 +19,7 @@ ErrorInternalErrorDetected=Erreur interne d ErrorNoRequestRan=Aucune requ�te ex�cut�e ErrorWrongHostParameter=Mauvais param�tre Serveur ErrorYourCountryIsNotDefined=Votre pays n'est pas d�fini. Aller dans Configuration-G�n�ral-Editer et resoumettez le formulaire. +ErrorRecordIsUsedByChild=Impossible de supprimer cet enregistrement. Ce dernier est utilis� en tant que p�re par au moins un enregistrement fils. HomeArea=Espace accueil LastAccess=Derni�re connexion RequestedUrl=Url sollicit�e