From cb04035914c02ff40b6c1c8c34684663bec432b6 Mon Sep 17 00:00:00 2001
From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Sun, 8 Nov 2009 10:54:57 +0000
Subject: [PATCH] Bug in adding freight cost to sales order/quotation
 Additional improvements on layout display

---
 CHANGELOG.txt                         | 8 ++++++++
 purchasing/includes/ui/invoice_ui.inc | 2 +-
 purchasing/view/view_po.php           | 2 +-
 sales/inquiry/sales_orders_view.php   | 2 +-
 sales/view/view_sales_order.php       | 4 ++--
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 5cbd91ac..9a60ee64 100644
--- 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 c5eafa80..4f419d53 100644
--- 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 ce2df934..32bd576d 100644
--- 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 f554f25e..ec009123 100644
--- 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 4529e1d4..ebf60096 100644
--- 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);
 
-- 
2.30.2