diff --git a/core/class/declarationtva_pdf.class.php b/core/class/declarationtva_pdf.class.php
index 14aa01c..b293906 100644
--- a/core/class/declarationtva_pdf.class.php
+++ b/core/class/declarationtva_pdf.class.php
@@ -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);