From 6fb8a987e7c3c71a3283370081fa43808b871521 Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Tue, 4 Aug 2020 08:08:33 +0200 Subject: [PATCH] PHP 7.4 bug, continued. --- purchasing/includes/db/grn_db.inc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/purchasing/includes/db/grn_db.inc b/purchasing/includes/db/grn_db.inc index d3cee339..6b741489 100644 --- a/purchasing/includes/db/grn_db.inc +++ b/purchasing/includes/db/grn_db.inc @@ -17,15 +17,14 @@ function update_average_material_cost($supplier, $stock_id, $price, $qty, $date, // save a couple of db calls like get_supplier() $supp = get_supplier($supplier); - if ($supplier != null) + if ($supplier != null) { $currency = $supp['curr_code']; - else + if ($supp['tax_included']) + $price = get_tax_free_price_for_item($stock_id, $price, $supp['tax_group_id'], + $supp['tax_included']); + } else $currency = null; - if ($supp['tax_included']) - $price = get_tax_free_price_for_item($stock_id, $price, $supp['tax_group_id'], - $supp['tax_included']); - if ($currency != null) { $ex_rate = get_exchange_rate_to_home_currency($currency, $date); -- 2.30.2