Bug in adding freight cost to sales order/quotation

Additional improvements on layout display

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 5cbd91accc1addd9b7abe83c4fa63db27a03d52c..9a60ee640375ffae09fe3c8f751f7734126a22e8 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,14 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+08-Nov-2009 Joe Hunt
+# Bug in adding freight cost to sales order/quotation
+$ /sales/inquiry/sales_orders_view.php
+! Additional improvements on layout display
+$ /purchasing/includes/ui/invoice_ui.inc
+  /purchasing/view/view_po.php
+  /sales/view/view_sales_order.php
+
 07-Nov-2009 Janusz Dobrowolski
 # Added missing help_context
 $ /sales/inquiry/sales_orders_view.php

diff --git a/purchasing/includes/ui/invoice_ui.inc b/purchasing/includes/ui/invoice_ui.inc
index c5eafa8039f8188b66015f546cf63526d42cd42c..4f419d533fc2c6436c87e17afa532dbe520ee5a1 100644 (file)
--- a/purchasing/includes/ui/invoice_ui.inc
+++ b/purchasing/includes/ui/invoice_ui.inc
@@ -308,7 +308,7 @@ function display_gl_items(&$supp_trans, $mode=0)
                display_gl_controls($supp_trans, $k);
        $colspan = ($dim == 2 ? 4 : ($dim == 1 ? 3 : 2));
        label_row(_("Total"), price_format($total_gl_value),
-               "colspan=".$colspan." align=right", "nowrap align=right");
+               "colspan=".$colspan." align=right", "nowrap align=right", ($mode==1?3:1));
 
        end_table();
        div_end();

diff --git a/purchasing/view/view_po.php b/purchasing/view/view_po.php
index ce2df9341b9a29d49c0dba6d283baf4c492f723b..32bd576db339040131e79d6d07531b5478837385 100644 (file)
--- a/purchasing/view/view_po.php
+++ b/purchasing/view/view_po.php
@@ -82,7 +82,7 @@ foreach ($purchase_order->line_items as $stock_item)
 
 $display_total = number_format2($total,user_price_dec());
 label_row(_("Total Excluding Tax/Shipping"), $display_total,
-       "align=right colspan=5", "nowrap align=right");
+       "align=right colspan=5", "nowrap align=right", 3);
 
 end_table();
 

diff --git a/sales/inquiry/sales_orders_view.php b/sales/inquiry/sales_orders_view.php
index f554f25e838c124b6426b3e3eeac9ed5f82bf5f0..ec0091232d96aba87076f866f672dfec6c59d88c 100644 (file)
--- a/sales/inquiry/sales_orders_view.php
+++ b/sales/inquiry/sales_orders_view.php
@@ -256,7 +256,7 @@ $sql = "SELECT
                ."sorder.ord_date,
                sorder.delivery_date,
                sorder.deliver_to,
-               Sum(line.unit_price*line.quantity*(1-line.discount_percent)+freight_cost) AS OrderValue,
+               Sum(line.unit_price*line.quantity*(1-line.discount_percent))+freight_cost AS OrderValue,
                sorder.type,
                debtor.curr_code,
                Sum(line.qty_sent) AS TotDelivered,

diff --git a/sales/view/view_sales_order.php b/sales/view/view_sales_order.php
index 4529e1d421e1773db7b13ea1d4d0f79d3a4d388c..ebf60096fa3cf9585d9c0ed62e61f4b422c9071e 100644 (file)
--- a/sales/view/view_sales_order.php
+++ b/sales/view/view_sales_order.php
@@ -228,9 +228,9 @@ $items_total = $_SESSION['View']->get_items_total();
 $display_total = price_format($items_total + $_SESSION['View']->freight_cost);
 
 label_row(_("Shipping"), price_format($_SESSION['View']->freight_cost),
-       "align=right colspan=6", "nowrap align=right");
+       "align=right colspan=6", "nowrap align=right", 1);
 label_row(_("Total Order Value"), $display_total, "align=right colspan=6",
-       "nowrap align=right");
+       "nowrap align=right", 1);
 
 end_table(2);