frank/DeclarationTVA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix duplicate accounting entries settings

Browse Source 
- 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
This commit is contained in:
Frank Cools 2025-10-08 21:32:37 +02:00
parent e1253999d8
commit abddcc1c30
4 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
admin/setup_mvp.php
View File

@ -522,15 +522,6 @@ print '</div>';
$account_options[$account['account_number']] = $account['account_number'] . ' - ' . $account['label']; $account_options[$account['account_number']] = $account['account_number'] . ' - ' . $account['label'];
} }
// Accounting entries toggle
print '<tr>';
print '<td><strong>' . $langs->trans("CreateAccountingEntries") . '</strong></td>';
print '<td>';
print '<small>' . $langs->trans("CreateAccountingEntriesDescription") . '</small><br>';
print $form->selectyesno('journal_create_accounting_entries', $journal_config['create_accounting_entries'], 1);
print '</td>';
print '</tr>';
print '<tr>'; print '<tr>';
print '<td><strong>' . $langs->trans("VATToPayAccount") . '</strong></td>'; print '<td><strong>' . $langs->trans("VATToPayAccount") . '</strong></td>';
print '<td>'; print '<td>';

4
core/class/declarationtva.class.php
View File

@ -1293,9 +1293,9 @@ class DeclarationTVA
// Check if accounting entries are enabled // Check if accounting entries are enabled
require_once DOL_DOCUMENT_ROOT . '/custom/declarationtva/core/class/declarationtva_config.class.php'; require_once DOL_DOCUMENT_ROOT . '/custom/declarationtva/core/class/declarationtva_config.class.php';
$config = new DeclarationTVA_Config($this->db, $this->entity); $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 // Accounting entries disabled - just update status
return $this->updateDeclarationStatus($declaration_id, 'submitted'); return $this->updateDeclarationStatus($declaration_id, 'submitted');
} }

3
core/class/declarationtva_config.class.php
View File

@ -720,8 +720,7 @@ class DeclarationTVA_Config
'vat_to_receive' => '44567', // TVA A PAYER (carry forward) 'vat_to_receive' => '44567', // TVA A PAYER (carry forward)
'vat_refund' => '445671', // TVA A REMBOURSER (immediate refund) 'vat_refund' => '445671', // TVA A REMBOURSER (immediate refund)
'other_charges' => '658', // AUTRES CHARGES DE GESTION COURANTE 'other_charges' => '658', // AUTRES CHARGES DE GESTION COURANTE
'other_products' => '758', // AUTRES PRODUITS DE GESTION COURANT 'other_products' => '758' // AUTRES PRODUITS DE GESTION COURANT
'create_accounting_entries' => 1 // Enable accounting entries by default
); );
$config = array(); $config = array();

2
langs/fr_FR/declarationtva.lang
View File

@ -536,8 +536,6 @@ VATRefundAccountDescription = Compte pour les remboursements immédiats de TVA (
VATRefundThresholdConfiguration = Configuration du seuil de remboursement TVA VATRefundThresholdConfiguration = Configuration du seuil de remboursement TVA
VATRefundThresholdConfigurationUpdated = Configuration du seuil de remboursement TVA mise à jour VATRefundThresholdConfigurationUpdated = Configuration du seuil de remboursement TVA mise à jour
VATRefundThresholdConfigurationUpdateFailed = Erreur lors de la mise à jour de la configuration du seuil de remboursement TVA 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 DeclarationSubmitted = Déclaration soumise avec succès
ErrorSubmittingDeclaration = Erreur lors de la soumission de la déclaration ErrorSubmittingDeclaration = Erreur lors de la soumission de la déclaration
Submit = Soumettre Submit = Soumettre