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

Use declaration name as libellé écriture in journal table

Browse Source 
- 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
This commit is contained in:
Frank Cools 2025-10-07 11:37:05 +02:00
parent ee62f2ea13
commit 4fc50a32fa
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/class/declarationtva_pdf.class.php
View File

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