From 4fc50a32faf2fb1044780a3185ea5d1ab4e66b02 Mon Sep 17 00:00:00 2001
From: Frank Cools <frank@covago.com>
Date: Tue, 7 Oct 2025 11:37:05 +0200
Subject: [PATCH] =?UTF-8?q?Use=20declaration=20name=20as=20libell=C3=A9=20?=
 =?UTF-8?q?=C3=A9criture=20in=20journal=20table?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Changed entry labels to use declaration number instead of generic labels
- Updated getLine8VATAccounts to use declaration name
- Updated getLine20Accounts to use declaration name
- Updated getVATResultEntry to use declaration name
- Updated getRoundingEntry to use declaration name
- All journal entries now show the declaration name as the entry label
---
 core/class/declarationtva_pdf.class.php | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/core/class/declarationtva_pdf.class.php b/core/class/declarationtva_pdf.class.php
index 20de41b..e633add 100644
--- a/core/class/declarationtva_pdf.class.php
+++ b/core/class/declarationtva_pdf.class.php
@@ -1851,13 +1851,13 @@ class DeclarationTVA_PDF
         $entries = array_merge($entries, $line20_entries);
         
         // Add VAT result on account 4456700
-        $vat_result_entry = $this->getVATResultEntry($ca3_lookup);
+        $vat_result_entry = $this->getVATResultEntry($declaration, $ca3_lookup);
         if ($vat_result_entry) {
             $entries[] = $vat_result_entry;
         }
         
         // Add rounding difference
-        $rounding_entry = $this->getRoundingEntry($ca3_lookup);
+        $rounding_entry = $this->getRoundingEntry($declaration, $ca3_lookup);
         if ($rounding_entry) {
             $entries[] = $rounding_entry;
         }
@@ -1893,7 +1893,7 @@ class DeclarationTVA_PDF
                 $entries[] = array(
                     'account_code' => $account['account_code'],
                     'account_label' => $account['account_label'],
-                    'entry_label' => 'TVA due - Ligne 08',
+                    'entry_label' => $declaration->declaration_number,
                     'debit' => $this->formatAmountReal($account['vat_amount']),
                     'credit' => ''
                 );
@@ -1931,7 +1931,7 @@ class DeclarationTVA_PDF
                 $entries[] = array(
                     'account_code' => $account['account_code'],
                     'account_label' => $account['account_label'],
-                    'entry_label' => 'TVA déductible - Ligne 20',
+                    'entry_label' => $declaration->declaration_number,
                     'debit' => '',
                     'credit' => $this->formatAmountReal($account['vat_amount'])
                 );
@@ -1944,10 +1944,11 @@ class DeclarationTVA_PDF
     /**
      * Get VAT result entry on account 4456700
      *
+     * @param DeclarationTVA $declaration Declaration object
      * @param array $ca3_lookup CA-3 data lookup array
      * @return array|null Journal entry
      */
-    private function getVATResultEntry($ca3_lookup)
+    private function getVATResultEntry($declaration, $ca3_lookup)
     {
         // Calculate VAT result (line 28 - line 29)
         $line28_amount = isset($ca3_lookup['28']) ? $ca3_lookup['28']['vat_amount'] : 0;
@@ -1961,7 +1962,7 @@ class DeclarationTVA_PDF
         $entry = array(
             'account_code' => '4456700',
             'account_label' => 'TVA à payer',
-            'entry_label' => 'Résultat TVA (L28-L29)',
+            'entry_label' => $declaration->declaration_number,
             'debit' => '',
             'credit' => ''
         );
@@ -1978,10 +1979,11 @@ class DeclarationTVA_PDF
     /**
      * Get rounding difference entry
      *
+     * @param DeclarationTVA $declaration Declaration object
      * @param array $ca3_lookup CA-3 data lookup array
      * @return array|null Journal entry
      */
-    private function getRoundingEntry($ca3_lookup)
+    private function getRoundingEntry($declaration, $ca3_lookup)
     {
         // Calculate rounding difference
         $total_vat_due = 0;
@@ -2012,7 +2014,7 @@ class DeclarationTVA_PDF
         $entry = array(
             'account_code' => '',
             'account_label' => '',
-            'entry_label' => 'Différence d\'arrondi',
+            'entry_label' => $declaration->declaration_number,
             'debit' => '',
             'credit' => ''
         );