PHP 8 rerun of number_format fix.

[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 9f0ecbca9c11675234348171c88d3e9a336b5d6b..c36e226826c05455799dc9c71beb1ecba735a4e3 100644 (file)
--- a/sales/includes/db/sales_delivery_db.inc
+++ b/sales/includes/db/sales_delivery_db.inc
@@ -137,13 +137,13 @@ function write_sales_delivery(&$delivery,$bo_policy)
                                                "The cost of sales GL posting could not be inserted");
                                        /*then remove asset*/
                                        add_gl_trans_std_cost(ST_CUSTDELIVERY, $delivery_no, $delivery->document_date,
-                                               $stock_gl_code["inventory_account"], 0, 0, "",
+                                               $stock_gl_code["inventory_account"], $dim, $dim2, "",
                                                -$fa_purchase_cost,
                                                PT_CUSTOMER, $delivery->customer_id,
                                                "The stock side of the cost of sales GL posting could not be inserted");
                                        /*finally adjust sales account with the remaining*/
                                        add_gl_trans_std_cost(ST_CUSTDELIVERY, $delivery_no, $delivery->document_date,
-                                               $stock_gl_code["cogs_account"], 0, 0, "",
+                                               $stock_gl_code["cogs_account"], $dim, $dim2, "",
                                                ($fa_purchase_cost - $fa_depreciation),
                                                PT_CUSTOMER, $delivery->customer_id,
                                                "The stock side of the cost of sales GL posting could not be inserted");
@@ -159,7 +159,7 @@ function write_sales_delivery(&$delivery,$bo_policy)
 
                                        /*now the stock entry*/
                                        add_gl_trans_std_cost(ST_CUSTDELIVERY, $delivery_no, $delivery->document_date,
-                                               $stock_gl_code["inventory_account"], 0, 0, "",
+                                               $stock_gl_code["inventory_account"], $dim, $dim2, "",
                                                (-$delivery_line->standard_cost * $delivery_line->qty_dispatched),
                                                PT_CUSTOMER, $delivery->customer_id,
                                                "The stock side of the cost of sales GL posting could not be inserted");
@@ -210,7 +210,7 @@ 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;
+       if (!is_array($row)) $freight = 0;
        else $freight = $row[0];
        if ($freight < $delivery->freight_cost) $delivery->freight_cost = $delivery->freight_cost - $freight;
        else $delivery->freight_cost = 0;