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

Fix duplicate field mappings causing F2 to show 0,00

Browse Source 
- Removed duplicate F1/F2 field mappings that were overwriting correct values
- Updated all remaining fields to use getCA3LineAmount() helper method
- Fixed D25, D26, DTD, D28, D29, subtotal_B16, subtotal_C23 fields
- All fields now consistently use the correct array structure lookup
- F2 should now display correct amount instead of 0,00
This commit is contained in:
Frank Cools 2025-10-03 13:45:12 +02:00
parent 909a309fe1
commit 3155ec7078
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -365,20 +365,18 @@ class DeclarationTVA_PDF
$field_data['C21_amount'] = $this->getCA3LineAmount($ca3_data, '21');
$field_data['C22_amount'] = $this->getCA3LineAmount($ca3_data, '22');
// Section F: Intracom Acquisitions
$field_data['F1_amount'] = isset($ca3_data['F1']) ? $this->formatAmount($ca3_data['F1']['vat_amount']) : '0,00';
$field_data['F2_amount'] = isset($ca3_data['F2']) ? $this->formatAmount($ca3_data['F2']['vat_amount']) : '0,00';
// Section F: Intracom Acquisitions (already mapped above in Section A)
// Section D: Résultat (Calculated)
$field_data['D25_amount'] = isset($ca3_data['25']) ? $this->formatAmount($ca3_data['25']['vat_amount']) : '0,00';
$field_data['D26_amount'] = isset($ca3_data['26']) ? $this->formatAmount($ca3_data['26']['vat_amount']) : '0,00';
$field_data['DTD_amount'] = isset($ca3_data['TD']) ? $this->formatAmount($ca3_data['TD']['vat_amount']) : '0,00';
$field_data['D28_amount'] = isset($ca3_data['28']) ? $this->formatAmount($ca3_data['28']['vat_amount']) : '0,00';
$field_data['D29_amount'] = isset($ca3_data['29']) ? $this->formatAmount($ca3_data['29']['vat_amount']) : '0,00';
$field_data['D25_amount'] = $this->getCA3LineAmount($ca3_data, '25');
$field_data['D26_amount'] = $this->getCA3LineAmount($ca3_data, '26');
$field_data['DTD_amount'] = $this->getCA3LineAmount($ca3_data, 'TD');
$field_data['D28_amount'] = $this->getCA3LineAmount($ca3_data, '28');
$field_data['D29_amount'] = $this->getCA3LineAmount($ca3_data, '29');
// Subtotals
$field_data['subtotal_B16_amount'] = isset($ca3_data['16']) ? $this->formatAmount($ca3_data['16']['vat_amount']) : '0,00';
$field_data['subtotal_C23_amount'] = isset($ca3_data['23']) ? $this->formatAmount($ca3_data['23']['vat_amount']) : '0,00';
$field_data['subtotal_B16_amount'] = $this->getCA3LineAmount($ca3_data, '16');
$field_data['subtotal_C23_amount'] = $this->getCA3LineAmount($ca3_data, '23');
// Grand totals
$field_data['total_vat_collected'] = $this->formatAmount($declaration->total_vat_collected);