Stable merged into unstable again (due to failure on binary file during previous...

[fa-stable.git] / sales / includes / db / sales_delivery_db.inc

diff --git a/sales/includes/db/sales_delivery_db.inc b/sales/includes/db/sales_delivery_db.inc
index 8f1c48718c2e440bde837942e73eea83cbfa4c0b..f74afa20ee4a8c474102fb085905cb5487144cb9 100644 (file)
--- a/sales/includes/db/sales_delivery_db.inc
+++ b/sales/includes/db/sales_delivery_db.inc
@@ -67,7 +67,7 @@ function write_sales_delivery(&$delivery,$bo_policy)
                $line_tax = get_full_price_for_item($delivery_line->stock_id, $delivery_line->price,
                        0, $delivery->tax_included, $delivery->tax_group_array) - $line_taxfree_price;
 
-               if ($trans_no != 0) // Inserted 2008-09-25 Joe Hunt
+               //if ($trans_no != 0) // Inserted 2008-09-25 Joe Hunt. This condition is removed after experience by Chaitanya
                        $delivery_line->standard_cost = get_standard_cost($delivery_line->stock_id);
 
                /* add delivery details for all lines */
@@ -148,6 +148,18 @@ function write_sales_delivery(&$delivery,$bo_policy)
        return $delivery_no;
 }
 
+//--------------------------------------------------------------------------------------------------
+function adjust_shipping_charge(&$delivery, $trans_no)
+{
+       $sql = "SELECT sum(ov_freight) as freight FROM ".TB_PREF."debtor_trans WHERE order_ = $trans_no AND type = " . ST_CUSTDELIVERY . " AND debtor_no = " . $delivery->customer_id;
+       $result = db_query($sql, "Can not find delivery notes");
+       $row = db_fetch_row($result);
+       if (!$row[0]) $freight = 0;
+       else $freight = $row[0];
+       if ($freight < $delivery->freight_cost) $delivery->freight_cost = $delivery->freight_cost - $freight;
+       else $delivery->freight_cost = 0;
+}
+
 //--------------------------------------------------------------------------------------------------
 
 function void_sales_delivery($type, $type_no, $transactions=true)
@@ -166,10 +178,8 @@ function void_sales_delivery($type, $type_no, $transactions=true)
 
        if ($order) {
                $auto = (get_reference(ST_SALESORDER, $order) == "auto");
-               $order_items = get_sales_order_details($order, ST_SALESORDER);
                while ($row = db_fetch($items_result)) {
-                       $order_line = db_fetch($order_items);
-                       update_parent_line(ST_CUSTDELIVERY, $order_line['id'], -$row['quantity'], $auto);
+                       update_parent_line(ST_CUSTDELIVERY, $row['src_id'], -$row['quantity'], $auto);
                }
        }