Improved layout in the new tax info display. Also old ones.

[fa-stable.git] / sales / customer_delivery.php

diff --git a/sales/customer_delivery.php b/sales/customer_delivery.php
index f41b058d6233865cf00134e16ae2598701543a74..74595a99d34322c52d980c2d9d5b080e78718df7 100644 (file)
--- a/sales/customer_delivery.php
+++ b/sales/customer_delivery.php
@@ -448,22 +448,25 @@ foreach ($_SESSION['Items']->line_items as $line=>$ln_itm) {
 $_POST['ChargeFreightCost'] =  get_post('ChargeFreightCost', 
        price_format($_SESSION['Items']->freight_cost));
 
-start_row();
+$colspan = 9;
 
-small_amount_cells(_("Shipping Cost"), 'ChargeFreightCost', $_SESSION['Items']->freight_cost, "colspan=9 align=right");
+start_row();
+label_cell(_("Shipping Cost"), "colspan=$colspan align=right");
+small_amount_cells(null, 'ChargeFreightCost', $_SESSION['Items']->freight_cost);
+end_row();
 
 $inv_items_total = $_SESSION['Items']->get_items_total_dispatch();
 
 $display_sub_total = price_format($inv_items_total + input_num('ChargeFreightCost'));
 
-label_row(_("Sub-total"), $display_sub_total, "colspan=9 align=right","align=right");
+label_row(_("Sub-total"), $display_sub_total, "colspan=$colspan align=right","align=right");
 
 $taxes = $_SESSION['Items']->get_taxes(input_num('ChargeFreightCost'));
-$tax_total = display_edit_tax_items($taxes, 9, $_SESSION['Items']->tax_included);
+$tax_total = display_edit_tax_items($taxes, $colspan, $_SESSION['Items']->tax_included);
 
 $display_total = price_format(($inv_items_total + input_num('ChargeFreightCost') + $tax_total));
 
-label_row(_("Amount Total"), $display_total, "colspan=9 align=right","align=right");
+label_row(_("Amount Total"), $display_total, "colspan=$colspan align=right","align=right");
 
 end_table(1);