diff --git a/declarationtva_view.php b/declarationtva_view.php
index b6d5c97..4d5929a 100644
--- a/declarationtva_view.php
+++ b/declarationtva_view.php
@@ -144,6 +144,9 @@ print '';
// Get actual CA-3 lines from database
$ca3_lines = $declarationtva->getCA3Lines($id);
+// Get CA-3 line definitions for proper descriptions
+$ca3_definitions = $config->getCA3LineDefinitions();
+
// Create a lookup array for quick access
$ca3_data = array();
foreach ($ca3_lines as $line) {
@@ -158,9 +161,10 @@ print '';
$section_a_lines = array('A1', 'A2', 'A3', 'A4', 'A5');
foreach ($section_a_lines as $line) {
$data = isset($ca3_data[$line]) ? $ca3_data[$line] : array('line_label' => '', 'vat_amount' => 0);
+ $description = isset($ca3_definitions[$line]) ? $ca3_definitions[$line]['label'] : $data['line_label'];
print '
';
print '| ' . $line . ' | ';
- print '' . $data['line_label'] . ' | ';
+ print '' . $description . ' | ';
print '' . price($data['vat_amount']) . ' | ';
print '
';
}
@@ -173,9 +177,10 @@ print '';
$section_b_lines = array('08', '09', '9B', '17');
foreach ($section_b_lines as $line) {
$data = isset($ca3_data[$line]) ? $ca3_data[$line] : array('line_label' => '', 'vat_amount' => 0);
+ $description = isset($ca3_definitions[$line]) ? $ca3_definitions[$line]['label'] : $data['line_label'];
print '';
print '| ' . $line . ' | ';
- print '' . $data['line_label'] . ' | ';
+ print '' . $description . ' | ';
print '' . price($data['vat_amount']) . ' | ';
print '
';
}
@@ -188,9 +193,10 @@ print '';
$section_c_lines = array('20', '21', '22');
foreach ($section_c_lines as $line) {
$data = isset($ca3_data[$line]) ? $ca3_data[$line] : array('line_label' => '', 'vat_amount' => 0);
+ $description = isset($ca3_definitions[$line]) ? $ca3_definitions[$line]['label'] : $data['line_label'];
print '';
print '| ' . $line . ' | ';
- print '' . $data['line_label'] . ' | ';
+ print '' . $description . ' | ';
print '' . price($data['vat_amount']) . ' | ';
print '
';
}
@@ -203,9 +209,10 @@ print '';
$section_d_lines = array('25', '26', '28', '29');
foreach ($section_d_lines as $line) {
$data = isset($ca3_data[$line]) ? $ca3_data[$line] : array('line_label' => '', 'vat_amount' => 0);
+ $description = isset($ca3_definitions[$line]) ? $ca3_definitions[$line]['label'] : $data['line_label'];
print '';
print '| ' . $line . ' | ';
- print '' . $data['line_label'] . ' | ';
+ print '' . $description . ' | ';
print '' . price($data['vat_amount']) . ' | ';
print '
';
}