More improvements on layout display.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 9272435482d92c7d13b5d6206db4e604d601589e..d7155fc0a8480578891c64e1adad520601380f2c 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,11 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+07-Nov-2009 Joe Hunt
+! More improvements on layout display.
+$ /purchases/includes/ui/po_ui.inc
+  /inventory/includes/item_adjustments_ui.inc
+  
 06-Nov-2009 Joe Hunt
 ! Improved layout in the new tax info display. Also old ones.
 $ /sales/credit_invoice.php

diff --git a/inventory/includes/item_adjustments_ui.inc b/inventory/includes/item_adjustments_ui.inc
index a8a7481aa5d43a86108edc9fb7133b60b50bdab3..7b67cca306a7fe7f90fb939aa466a281c421646a 100644 (file)
--- a/inventory/includes/item_adjustments_ui.inc
+++ b/inventory/includes/item_adjustments_ui.inc
@@ -99,7 +99,7 @@ function display_adjustment_items($title, &$order)
        if ($id == -1)
                adjustment_edit_item_controls($order);
 
-       label_row(_("Total"), number_format2($total,user_price_dec()), "colspan=5", "align=right");
+       label_row(_("Total"), number_format2($total,user_price_dec()), "align=right colspan=5", "align=right", 2);
 
     end_table();
        div_end();

diff --git a/purchasing/includes/ui/po_ui.inc b/purchasing/includes/ui/po_ui.inc
index 237d34b10c9d689af55e44ec0bc4fc00085ff66d..9c1f667a82b899a692e650fbcf1c8a776889947a 100644 (file)
--- a/purchasing/includes/ui/po_ui.inc
+++ b/purchasing/includes/ui/po_ui.inc
@@ -214,8 +214,8 @@ function display_po_items(&$order, $editable=true)
                po_item_controls($order);
 
     $display_total = price_format($total);
-    label_row(_("Total Excluding Shipping/Tax"), $display_total, "colspan=6 align=right",
-       "nowrap align=right");
+    label_row(_("Total Excluding Shipping/Tax"), $display_total, "colspan=7 align=right",
+       "nowrap align=right", 2);
 
        end_table(1);
        div_end();