vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix : we can't use the reserved word offset (#26705)

Browse source
This commit is contained in:
Maxime Kohlhaas 2023-11-18 12:10:04 +01:00 committed by GitHub
parent 1b91a9f83b
commit 05884f9b6a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
htdocs/expensereport/class/expensereport.class.php
View file

@ -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;
}
}
}