Remove extra header and right-align value column titles
Fixed: - Removed extra header line above section A - Right-aligned all value column titles (Amount, Base Amount, VAT Amount) - Professional look with consistent alignment - Table now starts directly with section A header
This commit is contained in:
parent
3d5e9b1ca8
commit
8524ff24ae
@ -135,12 +135,6 @@ print '<div class="titre">' . $langs->trans("CA3Amounts") . '</div>';
|
|||||||
|
|
||||||
print '<table class="noborder centpercent">';
|
print '<table class="noborder centpercent">';
|
||||||
|
|
||||||
print '<tr class="liste_titre">';
|
|
||||||
print '<th>' . $langs->trans("CA3Line") . '</th>';
|
|
||||||
print '<th>' . $langs->trans("Description") . '</th>';
|
|
||||||
print '<th>' . $langs->trans("Amount") . '</th>';
|
|
||||||
print '</tr>';
|
|
||||||
|
|
||||||
// Get actual CA-3 lines from database
|
// Get actual CA-3 lines from database
|
||||||
$ca3_lines = $declarationtva->getCA3Lines($id);
|
$ca3_lines = $declarationtva->getCA3Lines($id);
|
||||||
|
|
||||||
@ -161,7 +155,7 @@ print '</tr>';
|
|||||||
print '<tr class="liste_titre">';
|
print '<tr class="liste_titre">';
|
||||||
print '<th>' . $langs->trans("CA3Line") . '</th>';
|
print '<th>' . $langs->trans("CA3Line") . '</th>';
|
||||||
print '<th colspan="2">' . $langs->trans("Description") . '</th>';
|
print '<th colspan="2">' . $langs->trans("Description") . '</th>';
|
||||||
print '<th>' . $langs->trans("Amount") . '</th>';
|
print '<th class="right">' . $langs->trans("Amount") . '</th>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
$section_a_lines = array('A1', 'A2', 'A3', 'A4', 'A5');
|
$section_a_lines = array('A1', 'A2', 'A3', 'A4', 'A5');
|
||||||
@ -188,8 +182,8 @@ print '</tr>';
|
|||||||
print '<tr class="liste_titre">';
|
print '<tr class="liste_titre">';
|
||||||
print '<th>' . $langs->trans("CA3Line") . '</th>';
|
print '<th>' . $langs->trans("CA3Line") . '</th>';
|
||||||
print '<th>' . $langs->trans("Description") . '</th>';
|
print '<th>' . $langs->trans("Description") . '</th>';
|
||||||
print '<th>' . $langs->trans("BaseAmount") . '</th>';
|
print '<th class="right">' . $langs->trans("BaseAmount") . '</th>';
|
||||||
print '<th>' . $langs->trans("VATAmount") . '</th>';
|
print '<th class="right">' . $langs->trans("VATAmount") . '</th>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
$base_vat_lines = array('08', '09', '9B');
|
$base_vat_lines = array('08', '09', '9B');
|
||||||
@ -208,7 +202,7 @@ foreach ($base_vat_lines as $line) {
|
|||||||
print '<tr class="liste_titre">';
|
print '<tr class="liste_titre">';
|
||||||
print '<th>' . $langs->trans("CA3Line") . '</th>';
|
print '<th>' . $langs->trans("CA3Line") . '</th>';
|
||||||
print '<th colspan="2">' . $langs->trans("Description") . '</th>';
|
print '<th colspan="2">' . $langs->trans("Description") . '</th>';
|
||||||
print '<th>' . $langs->trans("Amount") . '</th>';
|
print '<th class="right">' . $langs->trans("Amount") . '</th>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
$data = isset($ca3_data['17']) ? $ca3_data['17'] : array('line_label' => '', 'vat_amount' => 0);
|
$data = isset($ca3_data['17']) ? $ca3_data['17'] : array('line_label' => '', 'vat_amount' => 0);
|
||||||
@ -227,7 +221,7 @@ print '</tr>';
|
|||||||
print '<tr class="liste_titre">';
|
print '<tr class="liste_titre">';
|
||||||
print '<th>' . $langs->trans("CA3Line") . '</th>';
|
print '<th>' . $langs->trans("CA3Line") . '</th>';
|
||||||
print '<th colspan="2">' . $langs->trans("Description") . '</th>';
|
print '<th colspan="2">' . $langs->trans("Description") . '</th>';
|
||||||
print '<th>' . $langs->trans("Amount") . '</th>';
|
print '<th class="right">' . $langs->trans("Amount") . '</th>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
$section_c_lines = array('20', '21', '22');
|
$section_c_lines = array('20', '21', '22');
|
||||||
@ -249,7 +243,7 @@ print '</tr>';
|
|||||||
print '<tr class="liste_titre">';
|
print '<tr class="liste_titre">';
|
||||||
print '<th>' . $langs->trans("CA3Line") . '</th>';
|
print '<th>' . $langs->trans("CA3Line") . '</th>';
|
||||||
print '<th colspan="2">' . $langs->trans("Description") . '</th>';
|
print '<th colspan="2">' . $langs->trans("Description") . '</th>';
|
||||||
print '<th>' . $langs->trans("Amount") . '</th>';
|
print '<th class="right">' . $langs->trans("Amount") . '</th>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
|
|
||||||
$section_d_lines = array('25', '26', '28', '29');
|
$section_d_lines = array('25', '26', '28', '29');
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user