From: Joe Hunt Date: Thu, 5 Nov 2009 00:40:23 +0000 (+0000) Subject: Include freight_cost in Sales Quotations, Orders in inquiries. X-Git-Tag: v2.4.2~19^2~1049 X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=ee88a73296f765b1b2a99f410f1d88a2b6afcc88;p=fa-stable.git Include freight_cost in Sales Quotations, Orders in inquiries. --- diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 12f986c2..91392d6a 100644 --- 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 50a23276..667c939e 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)) 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,