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

Restore all view fields to PDF export

Browse Source 
- Every field that shows on the view page should also show on the PDF
- Restored A1-A5 field mapping with proper amount extraction
- Added all Section A additional fields: E1-E6, F1-F2, F6-F8
- Updated debug logging to show actual field values
- Enhanced manual data file generation to include all fields
- PDF now mirrors the complete view page structure
This commit is contained in:
Frank Cools 2025-10-03 13:31:55 +02:00
parent ae764b76ce
commit 72c0fe8616
1 changed files with 38 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -307,13 +307,25 @@ class DeclarationTVA_PDF
$field_data['declaration_period_end'] = dol_print_date($declaration->end_date, 'day'); $field_data['declaration_period_end'] = dol_print_date($declaration->end_date, 'day');
$field_data['declaration_number'] = $declaration->declaration_number; $field_data['declaration_number'] = $declaration->declaration_number;
// Section A: Opérations imposables (reference only - no amounts to display) // Section A: Opérations imposables
// These fields are for user reference only and don't have actual amounts $field_data['A1_amount'] = isset($ca3_data['A1']) ? $this->formatAmount($ca3_data['A1']['vat_amount']) : '0,00';
$field_data['A1_amount'] = '0,00'; // Reference only $field_data['A2_amount'] = isset($ca3_data['A2']) ? $this->formatAmount($ca3_data['A2']['vat_amount']) : '0,00';
$field_data['A2_amount'] = '0,00'; // Reference only $field_data['A3_amount'] = isset($ca3_data['A3']) ? $this->formatAmount($ca3_data['A3']['vat_amount']) : '0,00';
$field_data['A3_amount'] = '0,00'; // Reference only $field_data['A4_amount'] = isset($ca3_data['A4']) ? $this->formatAmount($ca3_data['A4']['vat_amount']) : '0,00';
$field_data['A4_amount'] = '0,00'; // Reference only $field_data['A5_amount'] = isset($ca3_data['A5']) ? $this->formatAmount($ca3_data['A5']['vat_amount']) : '0,00';
$field_data['A5_amount'] = '0,00'; // Reference only
// Section A: Additional reference fields (E1-E6, F1-F2, F6-F8)
$field_data['E1_amount'] = isset($ca3_data['E1']) ? $this->formatAmount($ca3_data['E1']['vat_amount']) : '0,00';
$field_data['E2_amount'] = isset($ca3_data['E2']) ? $this->formatAmount($ca3_data['E2']['vat_amount']) : '0,00';
$field_data['E3_amount'] = isset($ca3_data['E3']) ? $this->formatAmount($ca3_data['E3']['vat_amount']) : '0,00';
$field_data['E4_amount'] = isset($ca3_data['E4']) ? $this->formatAmount($ca3_data['E4']['vat_amount']) : '0,00';
$field_data['E5_amount'] = isset($ca3_data['E5']) ? $this->formatAmount($ca3_data['E5']['vat_amount']) : '0,00';
$field_data['E6_amount'] = isset($ca3_data['E6']) ? $this->formatAmount($ca3_data['E6']['vat_amount']) : '0,00';
$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';
$field_data['F6_amount'] = isset($ca3_data['F6']) ? $this->formatAmount($ca3_data['F6']['vat_amount']) : '0,00';
$field_data['F7_amount'] = isset($ca3_data['F7']) ? $this->formatAmount($ca3_data['F7']['vat_amount']) : '0,00';
$field_data['F8_amount'] = isset($ca3_data['F8']) ? $this->formatAmount($ca3_data['F8']['vat_amount']) : '0,00';
// Debug: Log the CA-3 data structure for troubleshooting // Debug: Log the CA-3 data structure for troubleshooting
if (empty($ca3_data)) { if (empty($ca3_data)) {
@ -334,7 +346,7 @@ class DeclarationTVA_PDF
} }
// Debug: Log specific amount field values // Debug: Log specific amount field values
error_log("DeclarationTVA: A1_amount (reference only): 0,00"); error_log("DeclarationTVA: A1_amount will be: " . (isset($ca3_data['A1']) ? $this->formatAmount($ca3_data['A1']['vat_amount']) : '0,00'));
error_log("DeclarationTVA: B08_vat_amount will be: " . (isset($ca3_data['08']) ? $this->formatAmount($ca3_data['08']['vat_amount']) : '0,00')); error_log("DeclarationTVA: B08_vat_amount will be: " . (isset($ca3_data['08']) ? $this->formatAmount($ca3_data['08']['vat_amount']) : '0,00'));
error_log("DeclarationTVA: B09_vat_amount will be: " . (isset($ca3_data['09']) ? $this->formatAmount($ca3_data['09']['vat_amount']) : '0,00')); error_log("DeclarationTVA: B09_vat_amount will be: " . (isset($ca3_data['09']) ? $this->formatAmount($ca3_data['09']['vat_amount']) : '0,00'));
error_log("DeclarationTVA: total_vat_collected will be: " . $this->formatAmount($declaration->total_vat_collected)); error_log("DeclarationTVA: total_vat_collected will be: " . $this->formatAmount($declaration->total_vat_collected));
@ -637,13 +649,24 @@ class DeclarationTVA_PDF
$data_content .= "declaration_period_end: " . $field_data['declaration_period_end'] . "\n"; $data_content .= "declaration_period_end: " . $field_data['declaration_period_end'] . "\n";
$data_content .= "declaration_number: " . $field_data['declaration_number'] . "\n\n"; $data_content .= "declaration_number: " . $field_data['declaration_number'] . "\n\n";
$data_content .= "Section A - Opérations imposables (Reference Only):\n"; $data_content .= "Section A - Opérations imposables:\n";
$data_content .= "----------------------------------------------------\n"; $data_content .= "----------------------------------\n";
$data_content .= "A1_amount: " . $field_data['A1_amount'] . " (Reference only)\n"; $data_content .= "A1_amount: " . $field_data['A1_amount'] . "\n";
$data_content .= "A2_amount: " . $field_data['A2_amount'] . " (Reference only)\n"; $data_content .= "A2_amount: " . $field_data['A2_amount'] . "\n";
$data_content .= "A3_amount: " . $field_data['A3_amount'] . " (Reference only)\n"; $data_content .= "A3_amount: " . $field_data['A3_amount'] . "\n";
$data_content .= "A4_amount: " . $field_data['A4_amount'] . " (Reference only)\n"; $data_content .= "A4_amount: " . $field_data['A4_amount'] . "\n";
$data_content .= "A5_amount: " . $field_data['A5_amount'] . " (Reference only)\n\n"; $data_content .= "A5_amount: " . $field_data['A5_amount'] . "\n";
$data_content .= "E1_amount: " . $field_data['E1_amount'] . "\n";
$data_content .= "E2_amount: " . $field_data['E2_amount'] . "\n";
$data_content .= "E3_amount: " . $field_data['E3_amount'] . "\n";
$data_content .= "E4_amount: " . $field_data['E4_amount'] . "\n";
$data_content .= "E5_amount: " . $field_data['E5_amount'] . "\n";
$data_content .= "E6_amount: " . $field_data['E6_amount'] . "\n";
$data_content .= "F1_amount: " . $field_data['F1_amount'] . "\n";
$data_content .= "F2_amount: " . $field_data['F2_amount'] . "\n";
$data_content .= "F6_amount: " . $field_data['F6_amount'] . "\n";
$data_content .= "F7_amount: " . $field_data['F7_amount'] . "\n";
$data_content .= "F8_amount: " . $field_data['F8_amount'] . "\n\n";
$data_content .= "Section B - TVA due:\n"; $data_content .= "Section B - TVA due:\n";
$data_content .= "--------------------\n"; $data_content .= "--------------------\n";