Remove original amounts from subtotals and Section D
Fixed: - Line 16: Subtotal TVA due - no original amounts (just user reference) - Line 23: Subtotal TVA déductible - no original amounts (just user reference) - Section D lines (25, 26, TD, 28, 29): No original amounts (calculated from rounded values) - Only actual data lines (A1-A5, 08, 09, 9B, 17, 20-22) show original amounts in brackets - Section D uses rounded values for calculations as required
This commit is contained in:
parent
06b868d71e
commit
ce88aa69c1
@ -199,7 +199,7 @@ $data = isset($ca3_data['16']) ? $ca3_data['16'] : array('line_label' => '', 'va
|
|||||||
print '<tr class="pair">';
|
print '<tr class="pair">';
|
||||||
print '<td><strong>16</strong></td>';
|
print '<td><strong>16</strong></td>';
|
||||||
print '<td colspan="2"><strong>Sous-total TVA due (08 + 09 + 9B)</strong></td>';
|
print '<td colspan="2"><strong>Sous-total TVA due (08 + 09 + 9B)</strong></td>';
|
||||||
print '<td class="right"><strong>' . formatAmountWithOriginal($data['vat_amount'], $data['line_label']) . '</strong></td>';
|
print '<td class="right"><strong>' . price($data['vat_amount']) . '</strong></td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
// Reset to normal layout for line 17
|
// Reset to normal layout for line 17
|
||||||
@ -244,7 +244,7 @@ $data = isset($ca3_data['23']) ? $ca3_data['23'] : array('line_label' => '', 'va
|
|||||||
print '<tr class="pair">';
|
print '<tr class="pair">';
|
||||||
print '<td><strong>23</strong></td>';
|
print '<td><strong>23</strong></td>';
|
||||||
print '<td colspan="2"><strong>Sous-total TVA déductible (20 + 21 + 22)</strong></td>';
|
print '<td colspan="2"><strong>Sous-total TVA déductible (20 + 21 + 22)</strong></td>';
|
||||||
print '<td class="right"><strong>' . formatAmountWithOriginal($data['vat_amount'], $data['line_label']) . '</strong></td>';
|
print '<td class="right"><strong>' . price($data['vat_amount']) . '</strong></td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
// Section D: Résultat
|
// Section D: Résultat
|
||||||
@ -272,7 +272,7 @@ foreach ($section_d_lines as $line) {
|
|||||||
print '<tr>';
|
print '<tr>';
|
||||||
print '<td>' . $line . '</td>';
|
print '<td>' . $line . '</td>';
|
||||||
print '<td colspan="2">' . $description . '</td>';
|
print '<td colspan="2">' . $description . '</td>';
|
||||||
print '<td class="right">' . formatAmountWithOriginal($data['vat_amount'], $data['line_label']) . '</td>';
|
print '<td class="right">' . price($data['vat_amount']) . '</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user