From 05884f9b6ada00a42b04734405db1f84f22a917d Mon Sep 17 00:00:00 2001 From: Maxime Kohlhaas Date: Sat, 18 Nov 2023 12:10:04 +0100 Subject: [PATCH] Fix : we can't use the reserved word offset (#26705) --- htdocs/expensereport/class/expensereport.class.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php index 73851690f05..737cb367404 100644 --- a/htdocs/expensereport/class/expensereport.class.php +++ b/htdocs/expensereport/class/expensereport.class.php @@ -2603,7 +2603,7 @@ class ExpenseReport extends CommonObject //Clean $qty = price2num($qty); - $sql = " SELECT r.range_ik, t.ikoffset as offset, t.coef"; + $sql = " SELECT r.range_ik, t.ikoffset, t.coef"; $sql .= " FROM ".MAIN_DB_PREFIX."expensereport_ik t"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_exp_tax_range r ON r.rowid = t.fk_range"; $sql .= " WHERE t.fk_c_exp_tax_cat = ".(int) $fk_cat; @@ -2630,6 +2630,7 @@ class ExpenseReport extends CommonObject $obj = $this->db->fetch_object($resql); $cumulYearQty = $obj->cumul; } + $qty = $cumulYearQty + $qty; } @@ -2647,12 +2648,12 @@ class ExpenseReport extends CommonObject if ($i < ($num - 1)) { if ($qty > $ranges[$i]->range_ik && $qty < $ranges[$i+1]->range_ik) { $coef = $ranges[$i]->coef; - $offset = $ranges[$i]->offset; + $offset = $ranges[$i]->ikoffset; } } else { if ($qty > $ranges[$i]->range_ik) { $coef = $ranges[$i]->coef; - $offset = $ranges[$i]->offset; + $offset = $ranges[$i]->ikoffset; } } }