Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dolibarr
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
efe0d6fe
Commit
efe0d6fe
authored
19 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Patches
Plain Diff
Fix: Bug 14213
parent
7bc3f997
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
htdocs/admin/dict.php
+9
-2
9 additions, 2 deletions
htdocs/admin/dict.php
htdocs/langs/en_US/main.lang
+1
-0
1 addition, 0 deletions
htdocs/langs/en_US/main.lang
htdocs/langs/fr_FR/main.lang
+1
-0
1 addition, 0 deletions
htdocs/langs/fr_FR/main.lang
with
11 additions
and
2 deletions
htdocs/admin/dict.php
+
9
−
2
View file @
efe0d6fe
...
...
@@ -225,10 +225,17 @@ if ($_GET["action"] == 'delete') // delete
$result
=
$db
->
query
(
$sql
);
if
(
!
$result
)
{
if
(
$db
->
errno
()
==
'DB_ERROR_CHILD_EXISTS'
)
{
$msg
=
'<div class="error">'
.
$langs
->
trans
(
"ErrorRecordIsUsedByChild"
)
.
'</div>'
;
}
else
{
dolibarr_print_error
(
$db
);
}
}
}
if
(
$_GET
[
"action"
]
==
$acts
[
0
])
// activate
{
...
...
This diff is collapsed.
Click to expand it.
htdocs/langs/en_US/main.lang
+
1
−
0
View file @
efe0d6fe
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
htdocs/langs/fr_FR/main.lang
+
1
−
0
View file @
efe0d6fe
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment