lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stickler fix

Browse Source
This commit is contained in:
jpb 2022-05-23 19:59:54 +02:00
parent 68564b3b20
commit 68148c008c
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/expensereport/card.php
View File

@ -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) { 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 type_fee = jQuery("#fk_c_type_fees").find(":selected").val();
let tax_cat = jQuery("#select_fk_c_exp_tax_cat").find(":selected").val(); let tax_cat = jQuery("#select_fk_c_exp_tax_cat").find(":selected").val();
let tva = jQuery("#vatrate").find(":selected").val(); let tva = jQuery("#vatrate").find(":selected").val();
let qty = jQuery("#input_qty").val(); let qty = jQuery("#input_qty").val();
console.log(qty);
let path = "'.dol_buildpath("/expensereport/ajax/ajaxik.php", 1) .'"; let path = "'.dol_buildpath("/expensereport/ajax/ajaxik.php", 1) .'";
@ -2623,7 +2624,7 @@ if ($action == 'create') {
jQuery("#value_unit_ht").val(response.data); jQuery("#value_unit_ht").val(response.data);
}else{ }else{
console.log(response.errorMessage) /* console.log(response.errorMessage) */
} }
}, },

9
htdocs/expensereport/class/expensereport.class.php
View File

@ -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 * \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 $fk_cat Category of the vehicule used
* @param qty Number of kilometers * @param $qty Number of kilometers
* @param tva VAT rate * @param $tva VAT rate
* @return int <0 if KO, total ttc if OK * @return int <0 if KO, total ttc if OK
*/ */
function computeTotalKm($fk_cat, $qty, $tva) function computeTotalKm($fk_cat, $qty, $tva)
{ {
global $langs,$user,$db,$conf; global $langs,$user,$db,$conf;
$total_ttc = 0; $total_ttc = 0;
$ranges = array(); $ranges = array();
$coef = 0; $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 .= " 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 .= " WHERE t.fk_cat = ".(int) $fk_cat;
$sql .= " ORDER BY r.range_ik ASC"; $sql .= " ORDER BY r.range_ik ASC";
var_dump($sql);
dol_syslog("expenseReport::computeTotalkm sql=".$sql, LOG_DEBUG); dol_syslog("expenseReport::computeTotalkm sql=".$sql, LOG_DEBUG);
$result = $this->db->query($sql); $result = $this->db->query($sql);
@ -2614,6 +2616,7 @@ class ExpenseReport extends CommonObject
for ($i = 0; $i < $num; $i++) { for ($i = 0; $i < $num; $i++) {
if ($i < ($num - 1)) { if ($i < ($num - 1)) {
if ($qty > $ranges[$i]->range && $qty < $ranges[$i+1]->range) { if ($qty > $ranges[$i]->range && $qty < $ranges[$i+1]->range) {
$coef = $ranges[$i]->coef; $coef = $ranges[$i]->coef;
$offset = $ranges[$i]->offset; $offset = $ranges[$i]->offset;