Restore CA-3 line descriptions in declaration view
Fixed: - Added CA-3 line definitions lookup - Use proper descriptions from configuration - Fallback to database line_label if definition missing - All CA-3 lines now show proper descriptions: A1: Montant hors TVA des opérations imposables A2: Opérations imposables mais ne relevant pas du CA courant etc.
This commit is contained in:
parent
28b21ea4d3
commit
6723375a16
@ -144,6 +144,9 @@ print '</tr>';
|
||||
// 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 '</tr>';
|
||||
$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 '<tr>';
|
||||
print '<td>' . $line . '</td>';
|
||||
print '<td>' . $data['line_label'] . '</td>';
|
||||
print '<td>' . $description . '</td>';
|
||||
print '<td class="right">' . price($data['vat_amount']) . '</td>';
|
||||
print '</tr>';
|
||||
}
|
||||
@ -173,9 +177,10 @@ print '</tr>';
|
||||
$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 '<tr>';
|
||||
print '<td>' . $line . '</td>';
|
||||
print '<td>' . $data['line_label'] . '</td>';
|
||||
print '<td>' . $description . '</td>';
|
||||
print '<td class="right">' . price($data['vat_amount']) . '</td>';
|
||||
print '</tr>';
|
||||
}
|
||||
@ -188,9 +193,10 @@ print '</tr>';
|
||||
$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 '<tr>';
|
||||
print '<td>' . $line . '</td>';
|
||||
print '<td>' . $data['line_label'] . '</td>';
|
||||
print '<td>' . $description . '</td>';
|
||||
print '<td class="right">' . price($data['vat_amount']) . '</td>';
|
||||
print '</tr>';
|
||||
}
|
||||
@ -203,9 +209,10 @@ print '</tr>';
|
||||
$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 '<tr>';
|
||||
print '<td>' . $line . '</td>';
|
||||
print '<td>' . $data['line_label'] . '</td>';
|
||||
print '<td>' . $description . '</td>';
|
||||
print '<td class="right">' . price($data['vat_amount']) . '</td>';
|
||||
print '</tr>';
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user