Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-05 17:18:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
ldestailleur
2025-10-11 13:02:15 +02:00
parent 13313f56be 1e0548468e
commit ed28193e27
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2060,7 +2060,7 @@ class ExpenseReport extends CommonObject
*/ */
public function checkRules($type = 0, $seller = '') public function checkRules($type = 0, $seller = '')
{ {
global $conf, $db, $langs, $mysoc; global $conf, $langs, $mysoc;
$langs->load('trips'); $langs->load('trips');
@@ -2070,7 +2070,7 @@ class ExpenseReport extends CommonObject
$seller->tva_assuj = 1; // Most seller uses vat $seller->tva_assuj = 1; // Most seller uses vat
} }
$expensereportrule = new ExpenseReportRule($db); $expensereportrule = new ExpenseReportRule($this->db);
$rulestocheck = $expensereportrule->getAllRule($this->line->fk_c_type_fees, $this->line->date, $this->fk_user_author); $rulestocheck = $expensereportrule->getAllRule($this->line->fk_c_type_fees, $this->line->date, $this->fk_user_author);
$violation = 0; $violation = 0;
@@ -2740,7 +2740,7 @@ class ExpenseReport extends CommonObject
*/ */
public function computeTotalKm($fk_cat, $qty, $tva) public function computeTotalKm($fk_cat, $qty, $tva)
{ {
global $langs, $db, $conf; global $langs, $conf;
$cumulYearQty = 0; $cumulYearQty = 0;
$ranges = array(); $ranges = array();
@@ -2757,7 +2757,7 @@ class ExpenseReport extends CommonObject
return -1; return -1;
} }
$currentUser = new User($db); $currentUser = new User($this->db);
$currentUser->fetch($this->fk_user); $currentUser->fetch($this->fk_user);
$currentUser->loadRights('expensereport'); $currentUser->loadRights('expensereport');
//Clean //Clean