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

Fixing style errors.

Browse Source
This commit is contained in:
stickler-ci 2022-05-23 14:55:40 +00:00
parent eb526afc3a
commit d47715d9f5
2 changed files with 20 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/expensereport/ajax/ajaxik.php
View File

@ -88,14 +88,13 @@ if (empty($fk_expense) || $fk_expense < 0) {
$rep->errorMessage = json_encode(array('error' => $langs->transnoentitiesnoconv('ErrorRecordNotFound'), 'fk_user_author' => $expense->fk_user_author)); $rep->errorMessage = json_encode(array('error' => $langs->transnoentitiesnoconv('ErrorRecordNotFound'), 'fk_user_author' => $expense->fk_user_author));
$rep->response_status = 'error'; $rep->response_status = 'error';
} else { } else {
$expense = new ExpenseReport($db); $expense = new ExpenseReport($db);
$result = $expense->computeTotalKm($fk_c_exp_tax_cat,$qty,$vatrate); $result = $expense->computeTotalKm($fk_c_exp_tax_cat, $qty, $vatrate);
if ($result < 0){ if ($result < 0) {
$rep->error = $result; $rep->error = $result;
$rep->errorMessage = $langs->trans('errorComputeTtcOnMileageExpense'); $rep->errorMessage = $langs->trans('errorComputeTtcOnMileageExpense');
$rep->response_status = 'error'; $rep->response_status = 'error';
}else{ } else {
$rep->data = $result; $rep->data = $result;
$rep->response_status = 'success'; $rep->response_status = 'success';
} }

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

@ -2576,12 +2576,12 @@ class ExpenseReport extends CommonObject
$coef = 0; $coef = 0;
$offset = 0; $offset = 0;
if ($fk_cat < 0){ if ($fk_cat < 0) {
$this->error = $langs->trans('ErrorBadParameterCat'); $this->error = $langs->trans('ErrorBadParameterCat');
return -1; return -1;
} }
if ($qty <= 0){ if ($qty <= 0) {
$this->error = $langs->trans('ErrorBadParameterQty'); $this->error = $langs->trans('ErrorBadParameterQty');
return -1; return -1;
} }
@ -2601,62 +2601,45 @@ class ExpenseReport extends CommonObject
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result) if ($result) {
{
$num = $this->db->num_rows($result); $num = $this->db->num_rows($result);
if ($num) if ($num) {
{ for ($i = 0; $i < $num; $i++) {
for ($i = 0; $i < $num; $i++)
{
$obj = $this->db->fetch_object($result); $obj = $this->db->fetch_object($result);
$ranges[$i] = $obj; $ranges[$i] = $obj;
} }
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) {
{ $coef = $ranges[$i]->coef;
if ($qty > $ranges[$i]->range && $qty < $ranges[$i+1]->range) $offset = $ranges[$i]->offset;
{
$coef = $ranges[$i]->coef;
$offset = $ranges[$i]->offset;
}
} }
else } else {
{ if ($qty > $ranges[$i]->range) {
if ($qty > $ranges[$i]->range) $coef = $ranges[$i]->coef;
{ $offset = $ranges[$i]->offset;
$coef = $ranges[$i]->coef;
$offset = $ranges[$i]->offset;
}
} }
} }
}
$total_ht = $coef; $total_ht = $coef;
//$total_ttc = price2num($total_ht + ( $total_ht * $tva / 100),'MT'); //$total_ttc = price2num($total_ht + ( $total_ht * $tva / 100),'MT');
return $total_ht; return $total_ht;
} } else {
else
{
$this->error = $langs->trans('TaxUndefinedForThisCategory'); $this->error = $langs->trans('TaxUndefinedForThisCategory');
return -1; return -1;
} }
} else {
}
else
{
$this->error = $this->db->error()." sql=".$sql; $this->error = $this->db->error()." sql=".$sql;
return -1; return -1;
} }
} }
} }