From abddcc1c302042382991ddba779253abb8c8cdcf Mon Sep 17 00:00:00 2001 From: Frank Cools Date: Wed, 8 Oct 2025 21:32:37 +0200 Subject: [PATCH] Fix duplicate accounting entries settings - Remove duplicate 'Create accounting entries' toggle from journal configuration - Use existing 'Auto-create accounting entries' setting for submission workflow - Clean up unused language strings - Consolidate accounting entry control into single, clear setting --- admin/setup_mvp.php | 9 --------- core/class/declarationtva.class.php | 4 ++-- core/class/declarationtva_config.class.php | 3 +-- langs/fr_FR/declarationtva.lang | 2 -- 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/admin/setup_mvp.php b/admin/setup_mvp.php index b979516..17d56d5 100644 --- a/admin/setup_mvp.php +++ b/admin/setup_mvp.php @@ -522,15 +522,6 @@ print ''; $account_options[$account['account_number']] = $account['account_number'] . ' - ' . $account['label']; } - // Accounting entries toggle - print ''; - print '' . $langs->trans("CreateAccountingEntries") . ''; - print ''; - print '' . $langs->trans("CreateAccountingEntriesDescription") . '
'; - print $form->selectyesno('journal_create_accounting_entries', $journal_config['create_accounting_entries'], 1); - print ''; - print ''; - print ''; print '' . $langs->trans("VATToPayAccount") . ''; print ''; diff --git a/core/class/declarationtva.class.php b/core/class/declarationtva.class.php index ec664b2..86c42c9 100644 --- a/core/class/declarationtva.class.php +++ b/core/class/declarationtva.class.php @@ -1293,9 +1293,9 @@ class DeclarationTVA // Check if accounting entries are enabled require_once DOL_DOCUMENT_ROOT . '/custom/declarationtva/core/class/declarationtva_config.class.php'; $config = new DeclarationTVA_Config($this->db, $this->entity); - $journal_config = $config->getJournalConfiguration(); + $auto_create_config = $config->getAutoCreateAccountingConfiguration(); - if (!isset($journal_config['create_accounting_entries']) || !$journal_config['create_accounting_entries']) { + if (!isset($auto_create_config['auto_create_accounting']) || !$auto_create_config['auto_create_accounting']) { // Accounting entries disabled - just update status return $this->updateDeclarationStatus($declaration_id, 'submitted'); } diff --git a/core/class/declarationtva_config.class.php b/core/class/declarationtva_config.class.php index 6ae7809..2fabe45 100644 --- a/core/class/declarationtva_config.class.php +++ b/core/class/declarationtva_config.class.php @@ -720,8 +720,7 @@ class DeclarationTVA_Config 'vat_to_receive' => '44567', // TVA A PAYER (carry forward) 'vat_refund' => '445671', // TVA A REMBOURSER (immediate refund) 'other_charges' => '658', // AUTRES CHARGES DE GESTION COURANTE - 'other_products' => '758', // AUTRES PRODUITS DE GESTION COURANT - 'create_accounting_entries' => 1 // Enable accounting entries by default + 'other_products' => '758' // AUTRES PRODUITS DE GESTION COURANT ); $config = array(); diff --git a/langs/fr_FR/declarationtva.lang b/langs/fr_FR/declarationtva.lang index b829cb8..77ea8ed 100644 --- a/langs/fr_FR/declarationtva.lang +++ b/langs/fr_FR/declarationtva.lang @@ -536,8 +536,6 @@ VATRefundAccountDescription = Compte pour les remboursements immédiats de TVA ( VATRefundThresholdConfiguration = Configuration du seuil de remboursement TVA VATRefundThresholdConfigurationUpdated = Configuration du seuil de remboursement TVA mise à jour VATRefundThresholdConfigurationUpdateFailed = Erreur lors de la mise à jour de la configuration du seuil de remboursement TVA -CreateAccountingEntries = Créer les écritures comptables -CreateAccountingEntriesDescription = Activer la création automatique d'écritures comptables lors de la soumission des déclarations DeclarationSubmitted = Déclaration soumise avec succès ErrorSubmittingDeclaration = Erreur lors de la soumission de la déclaration Submit = Soumettre