diff --git a/htdocs/expensereport/ajax/ajaxik.php b/htdocs/expensereport/ajax/ajaxik.php index a4b6b3216eb..a23c8490a36 100644 --- a/htdocs/expensereport/ajax/ajaxik.php +++ b/htdocs/expensereport/ajax/ajaxik.php @@ -90,7 +90,7 @@ if (empty($fk_expense) || $fk_expense < 0) { } else { $expense = new ExpenseReport($db); $result = $expense->fetch($fk_expense); - if ($result){ + if ($result) { $result = $expense->computeTotalKm($fk_c_exp_tax_cat, $qty, $vatrate); if ($result < 0) { $rep->error = $result; @@ -101,7 +101,6 @@ if (empty($fk_expense) || $fk_expense < 0) { $rep->response_status = 'success'; } } - } } } diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php index d63188938ea..6b3e8b67399 100644 --- a/htdocs/expensereport/class/expensereport.class.php +++ b/htdocs/expensereport/class/expensereport.class.php @@ -2604,9 +2604,7 @@ class ExpenseReport extends CommonObject $result = $this->db->query($sql); if ($result) { - - if ($conf->global->EXPENSEREPORT_CALCULATE_MILEAGE_EXPENSE_COEFFICIENT_ON_CURRENT_YEAR){ - + if ($conf->global->EXPENSEREPORT_CALCULATE_MILEAGE_EXPENSE_COEFFICIENT_ON_CURRENT_YEAR) { $arrayDate = dol_getdate(dol_now()); $sql = " SELECT count(n.qty) as cumul FROM ".MAIN_DB_PREFIX."expensereport_det n"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport e ON e.rowid = n.fk_expensereport"; @@ -2618,12 +2616,11 @@ class ExpenseReport extends CommonObject $resql = $this->db->query($sql); - if ($resql){ + if ($resql) { $obj = $this->db->fetch_object($resql); $cumulYearQty = $obj->cumul; } $qty = $cumulYearQty + $qty; - } $num = $this->db->num_rows($result); @@ -2638,7 +2635,6 @@ class ExpenseReport extends CommonObject for ($i = 0; $i < $num; $i++) { if ($i < ($num - 1)) { - if ($qty > $ranges[$i]->range_ik && $qty < $ranges[$i+1]->range_ik) { $coef = $ranges[$i]->coef; $offset = $ranges[$i]->offset;