diff --git a/declarationtva_line_details_ajax.php b/declarationtva_line_details_ajax.php index 253ebaa..3d9e10d 100644 --- a/declarationtva_line_details_ajax.php +++ b/declarationtva_line_details_ajax.php @@ -83,9 +83,7 @@ echo ''; echo ''; echo ''; echo ''; -echo ''; -echo ''; -echo ''; +echo ''; echo ''; echo ''; @@ -102,7 +100,7 @@ $total_amount_other = 0; // Display BASE accounts first (if any) if (!empty($base_accounts)) { echo ''; - echo ''; + echo ''; echo ''; foreach ($base_accounts as $account) { @@ -114,8 +112,6 @@ if (!empty($base_accounts)) { echo ''; echo ''; echo ''; - echo ''; - echo ''; echo ''; echo ''; } @@ -124,8 +120,6 @@ if (!empty($base_accounts)) { echo ''; echo ''; echo ''; - echo ''; - echo ''; echo ''; echo ''; } @@ -133,7 +127,7 @@ if (!empty($base_accounts)) { // Display VAT accounts second (if any) if (!empty($vat_accounts)) { echo ''; - echo ''; + echo ''; echo ''; foreach ($vat_accounts as $account) { @@ -144,9 +138,7 @@ if (!empty($vat_accounts)) { echo ''; echo ''; echo ''; - echo ''; echo ''; - echo ''; echo ''; echo ''; } @@ -154,9 +146,7 @@ if (!empty($vat_accounts)) { // Subtotal for VAT accounts echo ''; echo ''; - echo ''; echo ''; - echo ''; echo ''; echo ''; } @@ -170,23 +160,17 @@ foreach ($other_accounts as $account) { echo ''; echo ''; echo ''; - echo ''; echo ''; - echo ''; echo ''; echo ''; } // Final totals row -$final_total_base = $total_base_base + $total_base_vat + $total_base_other; $final_total_vat = $total_vat_base + $total_vat_vat + $total_vat_other; -$final_total_amount = $total_amount_base + $total_amount_vat + $total_amount_other; echo ''; echo ''; -echo ''; echo ''; -echo ''; echo ''; echo '';
' . $langs->trans("AccountCode") . '' . $langs->trans("AccountLabel") . '' . $langs->trans("BaseAmount") . '' . $langs->trans("VATAmount") . '' . $langs->trans("TotalAmount") . '' . $langs->trans("Amount") . '' . $langs->trans("MappingType") . '
' . $langs->trans("BaseAccounts") . '' . $langs->trans("BaseAccounts") . '
' . $account['account_code'] . '' . $account['account_label'] . '' . price($account['base_amount']) . '' . price($account['vat_amount']) . '' . price($account['total_amount']) . '' . $account['mapping_type'] . '
' . $langs->trans("SubtotalBaseAccounts") . '' . price($total_base_base) . '' . price($total_vat_base) . '' . price($total_amount_base) . '
' . $langs->trans("VATAccounts") . '' . $langs->trans("VATAccounts") . '
' . $account['account_code'] . '' . $account['account_label'] . '' . price($account['base_amount']) . '' . price($account['vat_amount']) . '' . price($account['total_amount']) . '' . $account['mapping_type'] . '
' . $langs->trans("SubtotalVATAccounts") . '' . price($total_base_vat) . '' . price($total_vat_vat) . '' . price($total_amount_vat) . '
' . $account['account_code'] . '' . $account['account_label'] . '' . price($account['base_amount']) . '' . price($account['vat_amount']) . '' . price($account['total_amount']) . '' . $account['mapping_type'] . '
' . $langs->trans("GrandTotal") . '' . price($final_total_base) . '' . price($final_total_vat) . '' . price($final_total_amount) . '