From 99683fab109b72a8c5108358b5a4c917bdf68a2d Mon Sep 17 00:00:00 2001 From: Frank Cools Date: Wed, 8 Oct 2025 21:51:31 +0200 Subject: [PATCH] Pass user object to submitDeclaration method - Add user parameter to submitDeclaration method signature - Pass user object from view file to submitDeclaration method - Remove redundant global user declaration - Fixes null user parameter in bookkeeping create method --- core/class/declarationtva.class.php | 5 ++--- declarationtva_view.php | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/core/class/declarationtva.class.php b/core/class/declarationtva.class.php index 9f06929..b10e770 100644 --- a/core/class/declarationtva.class.php +++ b/core/class/declarationtva.class.php @@ -1290,12 +1290,11 @@ class DeclarationTVA * Submit declaration (create accounting entries and update status) * * @param int $declaration_id Declaration ID + * @param object $user User object * @return bool Success */ - public function submitDeclaration($declaration_id) + public function submitDeclaration($declaration_id, $user) { - global $user; - // Get declaration data $declaration = $this->fetch($declaration_id); if (!$declaration) { diff --git a/declarationtva_view.php b/declarationtva_view.php index ef404a9..d5a8b51 100644 --- a/declarationtva_view.php +++ b/declarationtva_view.php @@ -114,7 +114,7 @@ if ($action == 'unvalidate' && $token) { if ($action == 'submit' && $token) { // Submit the declaration (create accounting entries and update status) - if ($declarationtva->submitDeclaration($id)) { + if ($declarationtva->submitDeclaration($id, $user)) { setEventMessages($langs->trans("DeclarationSubmitted"), null, 'mesgs'); } else { setEventMessages($langs->trans("ErrorSubmittingDeclaration") . ": " . $declarationtva->error, null, 'errors');