FIX add display of an error when attempting to delete a committed tra…

…nsaction (#26573) * add display of an error when attempting to delete a committed transaction * update
Dolibarr · Nov 14, 2023 · 966e26e · 966e26e
1 parent 201ad75
commit 966e26e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 3 deletions.
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
@@ -519,7 +519,11 @@
 					setEventMessages($object->error, $object->errors, 'errors');
 					$error++;
 					break;
-				}
+                } elseif (isset($object->date_validation) || $object->date_validation != '') {
+                    setEventMessages($langs->trans("ValidatedRecordWhereFound"), null, 'errors');
+                    $error++;
+                    break;
+                }
 			}
 		}
 

diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -430,7 +430,11 @@
 					setEventMessages($object->error, $object->errors, 'errors');
 					$error++;
 					break;
-				}
+				} elseif (isset($object->date_validation) || $object->date_validation != '') {
+                    setEventMessages($langs->trans("ValidatedRecordWhereFound"), null, 'errors');
+                    $error++;
+                    break;
+                }
 			}
 		}
 

diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
@@ -798,7 +798,7 @@ public function fetch($id, $ref = null, $mode = '')
 				$this->piece_num = $obj->piece_num;
 				$this->date_creation = $this->db->jdate($obj->date_creation);
 				$this->date_export = $this->db->jdate($obj->date_export);
-				$this->date_validation = isset($obj->date_validated) ? $this->db->jdate($obj->date_validated) : '';
+				$this->date_validation = isset($obj->date_validation) ? $this->db->jdate($obj->date_validation) : '';
 			}
 			$this->db->free($resql);
 

diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
@@ -719,6 +719,7 @@ RecordModifiedSuccessfully=Record modified successfully
 RecordsModified=%s record(s) modified
 RecordsDeleted=%s record(s) deleted
 RecordsGenerated=%s record(s) generated
+ValidatedRecordWhereFound = Some of the selected records have already been validated. No records have been deleted.
 AutomaticCode=Automatic code
 FeatureDisabled=Feature disabled
 MoveBox=Move widget

diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
@@ -717,6 +717,7 @@ RecordModifiedSuccessfully=Enregistrement modifié avec succès
 RecordsModified=%s enregistrements modifiés
 RecordsDeleted=%s enregistrement(s) supprimé(s)
 RecordsGenerated=%s enregistrement(s) généré(s)
+ValidatedRecordWhereFound = Certains des enregistrements sélectionnés ont déjà été validés. Aucun enregistrement n'a été supprimé.
 AutomaticCode=Création automatique du code
 FeatureDisabled=Fonction désactivée
 MoveBox=Déplacer le widget