diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php index c14edaa68da..7c32fefc61e 100644 --- a/htdocs/expensereport/card.php +++ b/htdocs/expensereport/card.php @@ -2597,13 +2597,14 @@ if ($action == 'create') { } }); - /* price calculation */ + /* unit price coéf calculation */ jQuery("#input_qty, #fk_c_type_fees, #select_fk_c_exp_tax_cat, #vatrate ").change(function(event) { let type_fee = jQuery("#fk_c_type_fees").find(":selected").val(); let tax_cat = jQuery("#select_fk_c_exp_tax_cat").find(":selected").val(); let tva = jQuery("#vatrate").find(":selected").val(); let qty = jQuery("#input_qty").val(); + console.log(qty); let path = "'.dol_buildpath("/expensereport/ajax/ajaxik.php", 1) .'"; @@ -2623,7 +2624,7 @@ if ($action == 'create') { jQuery("#value_unit_ht").val(response.data); }else{ - console.log(response.errorMessage) + /* console.log(response.errorMessage) */ } }, diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php index 4b8fc325f8e..5a08b8c18df 100644 --- a/htdocs/expensereport/class/expensereport.class.php +++ b/htdocs/expensereport/class/expensereport.class.php @@ -2562,15 +2562,16 @@ class ExpenseReport extends CommonObject /** * \brief Compute the cost of the kilometers expense based on the number of kilometers and the vehicule category * - * @param fk_cat Category of the vehicule used - * @param qty Number of kilometers - * @param tva VAT rate + * @param $fk_cat Category of the vehicule used + * @param $qty Number of kilometers + * @param $tva VAT rate * @return int <0 if KO, total ttc if OK */ function computeTotalKm($fk_cat, $qty, $tva) { global $langs,$user,$db,$conf; + $total_ttc = 0; $ranges = array(); $coef = 0; @@ -2597,6 +2598,7 @@ class ExpenseReport extends CommonObject $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_exp_tax_range r ON r.rowid = t.fk_range"; $sql .= " WHERE t.fk_cat = ".(int) $fk_cat; $sql .= " ORDER BY r.range_ik ASC"; + var_dump($sql); dol_syslog("expenseReport::computeTotalkm sql=".$sql, LOG_DEBUG); $result = $this->db->query($sql); @@ -2614,6 +2616,7 @@ class ExpenseReport extends CommonObject for ($i = 0; $i < $num; $i++) { if ($i < ($num - 1)) { + if ($qty > $ranges[$i]->range && $qty < $ranges[$i+1]->range) { $coef = $ranges[$i]->coef; $offset = $ranges[$i]->offset;