Include freight_cost in Sales Quotations, Orders in inquiries.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 12f986c26b30be6c3f347c0e3b4fd0a651da1b48..91392d6afad4db1447f666d5c31edc0c7c5e76b5 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -22,6 +22,8 @@ $ -> Affected files
 05-Nov-2009 Joe Hunt
 ! Display tax info in Sales Quotation, Order, Direct Delivery and Invoice.
 $ /sales/includes/ui/sales_order_ui.inc
+! Include freight_cost in Sales Quotations, Orders in inquiries.
+$ /sales/inquiry/sales_orders_view.php
 
 04-Nov-2009 Tom Hallman/Joe Hunt
 ! Included dimension(s) in Bank Deposit/Payment View and correct signs.

diff --git a/sales/inquiry/sales_orders_view.php b/sales/inquiry/sales_orders_view.php
index 50a232764fdd686ed39e51399be78dafbc608691..667c939e215ca5492b371b6eee5bc5b4627fe6fa 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)) 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,