diff --git a/htdocs/expensereport/ajax/ajaxik.php b/htdocs/expensereport/ajax/ajaxik.php index 9abd767e1f9..89275498b6d 100644 --- a/htdocs/expensereport/ajax/ajaxik.php +++ b/htdocs/expensereport/ajax/ajaxik.php @@ -76,6 +76,7 @@ if (empty($fk_expense) || $fk_expense < 0) { $rep->errorMessage = $langs->transnoentitiesnoconv('ErrorBadValueForParameter', $fk_c_exp_tax_cat, 'fk_c_exp_tax_cat'); $rep->response_status = 'error'; + } else { // @see ndfp.class.php:3576 (method: compute_total_km) $expense = new ExpenseReport($db); diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php index faa71b6f39e..729b95bc2c2 100644 --- a/htdocs/expensereport/card.php +++ b/htdocs/expensereport/card.php @@ -2626,6 +2626,7 @@ if ($action == 'create') { ,success:function(response) { if (response.response_status == "success"){ jQuery("#value_unit_ht").val(response.data); + jQuery("#value_unit_ht").trigger("change"); jQuery("#value_unit").val(""); } }, diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php index 607a2035ed7..da93c26ceaa 100644 --- a/htdocs/expensereport/class/expensereport.class.php +++ b/htdocs/expensereport/class/expensereport.class.php @@ -2610,7 +2610,7 @@ class ExpenseReport extends CommonObject $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."expensereport e ON e.rowid = n.fk_expensereport"; $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_fees tf ON tf.id = n.fk_c_type_fees"; $sql.= " WHERE e.fk_user_author = ".(int) $this->fk_user_author; - $sql.= " AND YEAR(n.date) = ".(int) $arrayDate['year'] ; + $sql.= " AND YEAR(n.date) = ".(int) $arrayDate['year']; $sql.= " AND tf.code = 'EX_KME' "; $sql.= " AND e.fk_statut = ".(int) ExpenseReport::STATUS_VALIDATED;