';
// List of actions on element
diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php
index aa892e50fc0..98da4534e0c 100644
--- a/htdocs/expensereport/class/api_expensereports.class.php
+++ b/htdocs/expensereport/class/api_expensereports.class.php
@@ -33,7 +33,7 @@ class ExpenseReports extends DolibarrApi
/**
* @var array $FIELDS Mandatory fields, checked when create and update object
*/
- static $FIELDS = array(
+ public static $FIELDS = array(
'fk_user_author'
);
@@ -107,11 +107,12 @@ class ExpenseReports extends DolibarrApi
$sql = "SELECT t.rowid";
$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as t";
$sql .= ' WHERE t.entity IN ('.getEntity('expensereport').')';
- if ($user_ids) $sql .= " AND t.fk_user_author IN (".$user_ids.")";
+ if ($user_ids) {
+ $sql .= " AND t.fk_user_author IN (".$user_ids.")";
+ }
// Add sql filters
- if ($sqlfilters)
- {
+ if ($sqlfilters) {
if (!DolibarrApi::_checkFilters($sqlfilters)) {
throw new RestException(503, 'Error when validating parameter sqlfilters '.$sqlfilters);
}
@@ -131,13 +132,11 @@ class ExpenseReports extends DolibarrApi
$result = $this->db->query($sql);
- if ($result)
- {
+ if ($result) {
$num = $this->db->num_rows($result);
$min = min($num, ($limit <= 0 ? $num : $limit));
$i = 0;
- while ($i < $min)
- {
+ while ($i < $min) {
$obj = $this->db->fetch_object($result);
$expensereport_static = new ExpenseReport($this->db);
if ($expensereport_static->fetch($obj->rowid)) {
@@ -172,12 +171,12 @@ class ExpenseReports extends DolibarrApi
$this->expensereport->$field = $value;
}
/*if (isset($request_data["lines"])) {
- $lines = array();
- foreach ($request_data["lines"] as $line) {
- array_push($lines, (object) $line);
- }
- $this->expensereport->lines = $lines;
- }*/
+ $lines = array();
+ foreach ($request_data["lines"] as $line) {
+ array_push($lines, (object) $line);
+ }
+ $this->expensereport->lines = $lines;
+ }*/
if ($this->expensereport->create(DolibarrApiAccess::$user) < 0) {
throw new RestException(500, "Error creating expensereport", array_merge(array($this->expensereport->error), $this->expensereport->errors));
}
@@ -195,28 +194,28 @@ class ExpenseReports extends DolibarrApi
* @return int
*/
/*
- public function getLines($id)
- {
- if(! DolibarrApiAccess::$user->rights->expensereport->lire) {
- throw new RestException(401);
- }
+ public function getLines($id)
+ {
+ if(! DolibarrApiAccess::$user->rights->expensereport->lire) {
+ throw new RestException(401);
+ }
- $result = $this->expensereport->fetch($id);
- if( ! $result ) {
- throw new RestException(404, 'expensereport not found');
- }
+ $result = $this->expensereport->fetch($id);
+ if( ! $result ) {
+ throw new RestException(404, 'expensereport not found');
+ }
- if( ! DolibarrApi::_checkAccessToResource('expensereport',$this->expensereport->id)) {
- throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
- }
- $this->expensereport->getLinesArray();
- $result = array();
- foreach ($this->expensereport->lines as $line) {
- array_push($result,$this->_cleanObjectDatas($line));
- }
- return $result;
- }
- */
+ if( ! DolibarrApi::_checkAccessToResource('expensereport',$this->expensereport->id)) {
+ throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+ }
+ $this->expensereport->getLinesArray();
+ $result = array();
+ foreach ($this->expensereport->lines as $line) {
+ array_push($result,$this->_cleanObjectDatas($line));
+ }
+ return $result;
+ }
+ */
/**
* Add a line to given Expense Report
@@ -229,56 +228,56 @@ class ExpenseReports extends DolibarrApi
* @return int
*/
/*
- public function postLine($id, $request_data = null)
- {
- if(! DolibarrApiAccess::$user->rights->expensereport->creer) {
- throw new RestException(401);
- }
+ public function postLine($id, $request_data = null)
+ {
+ if(! DolibarrApiAccess::$user->rights->expensereport->creer) {
+ throw new RestException(401);
+ }
- $result = $this->expensereport->fetch($id);
- if( ! $result ) {
- throw new RestException(404, 'expensereport not found');
- }
+ $result = $this->expensereport->fetch($id);
+ if( ! $result ) {
+ throw new RestException(404, 'expensereport not found');
+ }
- if( ! DolibarrApi::_checkAccessToResource('expensereport',$this->expensereport->id)) {
- throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
- }
- $request_data = (object) $request_data;
- $updateRes = $this->expensereport->addline(
- $request_data->desc,
- $request_data->subprice,
- $request_data->qty,
- $request_data->tva_tx,
- $request_data->localtax1_tx,
- $request_data->localtax2_tx,
- $request_data->fk_product,
- $request_data->remise_percent,
- $request_data->info_bits,
- $request_data->fk_remise_except,
- 'HT',
- 0,
- $request_data->date_start,
- $request_data->date_end,
- $request_data->product_type,
- $request_data->rang,
- $request_data->special_code,
- $fk_parent_line,
- $request_data->fk_fournprice,
- $request_data->pa_ht,
- $request_data->label,
- $request_data->array_options,
- $request_data->fk_unit,
- $this->element,
- $request_data->id
- );
+ if( ! DolibarrApi::_checkAccessToResource('expensereport',$this->expensereport->id)) {
+ throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+ }
+ $request_data = (object) $request_data;
+ $updateRes = $this->expensereport->addline(
+ $request_data->desc,
+ $request_data->subprice,
+ $request_data->qty,
+ $request_data->tva_tx,
+ $request_data->localtax1_tx,
+ $request_data->localtax2_tx,
+ $request_data->fk_product,
+ $request_data->remise_percent,
+ $request_data->info_bits,
+ $request_data->fk_remise_except,
+ 'HT',
+ 0,
+ $request_data->date_start,
+ $request_data->date_end,
+ $request_data->product_type,
+ $request_data->rang,
+ $request_data->special_code,
+ $fk_parent_line,
+ $request_data->fk_fournprice,
+ $request_data->pa_ht,
+ $request_data->label,
+ $request_data->array_options,
+ $request_data->fk_unit,
+ $this->element,
+ $request_data->id
+ );
- if ($updateRes > 0) {
- return $updateRes;
+ if ($updateRes > 0) {
+ return $updateRes;
- }
- return false;
- }
- */
+ }
+ return false;
+ }
+ */
/**
* Update a line to given Expense Report
@@ -292,53 +291,53 @@ class ExpenseReports extends DolibarrApi
* @return object
*/
/*
- public function putLine($id, $lineid, $request_data = null)
- {
- if(! DolibarrApiAccess::$user->rights->expensereport->creer) {
- throw new RestException(401);
- }
+ public function putLine($id, $lineid, $request_data = null)
+ {
+ if(! DolibarrApiAccess::$user->rights->expensereport->creer) {
+ throw new RestException(401);
+ }
- $result = $this->expensereport->fetch($id);
- if( ! $result ) {
- throw new RestException(404, 'expensereport not found');
- }
+ $result = $this->expensereport->fetch($id);
+ if( ! $result ) {
+ throw new RestException(404, 'expensereport not found');
+ }
- if( ! DolibarrApi::_checkAccessToResource('expensereport',$this->expensereport->id)) {
- throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
- }
- $request_data = (object) $request_data;
- $updateRes = $this->expensereport->updateline(
- $lineid,
- $request_data->desc,
- $request_data->subprice,
- $request_data->qty,
- $request_data->remise_percent,
- $request_data->tva_tx,
- $request_data->localtax1_tx,
- $request_data->localtax2_tx,
- 'HT',
- $request_data->info_bits,
- $request_data->date_start,
- $request_data->date_end,
- $request_data->product_type,
- $request_data->fk_parent_line,
- 0,
- $request_data->fk_fournprice,
- $request_data->pa_ht,
- $request_data->label,
- $request_data->special_code,
- $request_data->array_options,
- $request_data->fk_unit
- );
+ if( ! DolibarrApi::_checkAccessToResource('expensereport',$this->expensereport->id)) {
+ throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+ }
+ $request_data = (object) $request_data;
+ $updateRes = $this->expensereport->updateline(
+ $lineid,
+ $request_data->desc,
+ $request_data->subprice,
+ $request_data->qty,
+ $request_data->remise_percent,
+ $request_data->tva_tx,
+ $request_data->localtax1_tx,
+ $request_data->localtax2_tx,
+ 'HT',
+ $request_data->info_bits,
+ $request_data->date_start,
+ $request_data->date_end,
+ $request_data->product_type,
+ $request_data->fk_parent_line,
+ 0,
+ $request_data->fk_fournprice,
+ $request_data->pa_ht,
+ $request_data->label,
+ $request_data->special_code,
+ $request_data->array_options,
+ $request_data->fk_unit
+ );
- if ($updateRes > 0) {
- $result = $this->get($id);
- unset($result->line);
- return $this->_cleanObjectDatas($result);
- }
- return false;
- }
- */
+ if ($updateRes > 0) {
+ $result = $this->get($id);
+ unset($result->line);
+ return $this->_cleanObjectDatas($result);
+ }
+ return false;
+ }
+ */
/**
* Delete a line of given Expense Report
@@ -351,30 +350,30 @@ class ExpenseReports extends DolibarrApi
* @return int
*/
/*
- public function deleteLine($id, $lineid)
- {
- if(! DolibarrApiAccess::$user->rights->expensereport->creer) {
- throw new RestException(401);
- }
+ public function deleteLine($id, $lineid)
+ {
+ if(! DolibarrApiAccess::$user->rights->expensereport->creer) {
+ throw new RestException(401);
+ }
- $result = $this->expensereport->fetch($id);
- if( ! $result ) {
- throw new RestException(404, 'expensereport not found');
- }
+ $result = $this->expensereport->fetch($id);
+ if( ! $result ) {
+ throw new RestException(404, 'expensereport not found');
+ }
- if( ! DolibarrApi::_checkAccessToResource('expensereport',$this->expensereport->id)) {
- throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
- }
+ if( ! DolibarrApi::_checkAccessToResource('expensereport',$this->expensereport->id)) {
+ throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+ }
- // TODO Check the lineid $lineid is a line of ojbect
+ // TODO Check the lineid $lineid is a line of ojbect
- $updateRes = $this->expensereport->deleteline($lineid);
- if ($updateRes == 1) {
- return $this->get($id);
- }
- return false;
- }
- */
+ $updateRes = $this->expensereport->deleteline($lineid);
+ if ($updateRes == 1) {
+ return $this->get($id);
+ }
+ return false;
+ }
+ */
/**
* Update Expense Report general fields (won't touch lines of expensereport)
@@ -403,12 +402,13 @@ class ExpenseReports extends DolibarrApi
throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
}
foreach ($request_data as $field => $value) {
- if ($field == 'id') continue;
+ if ($field == 'id') {
+ continue;
+ }
$this->expensereport->$field = $value;
}
- if ($this->expensereport->update(DolibarrApiAccess::$user) > 0)
- {
+ if ($this->expensereport->update(DolibarrApiAccess::$user) > 0) {
return $this->get($id);
} else {
throw new RestException(500, $this->expensereport->error);
@@ -464,31 +464,31 @@ class ExpenseReports extends DolibarrApi
* }
*/
/*
- public function validate($id, $idwarehouse=0)
- {
- if(! DolibarrApiAccess::$user->rights->expensereport->creer) {
- throw new RestException(401);
- }
- $result = $this->expensereport->fetch($id);
- if( ! $result ) {
- throw new RestException(404, 'expensereport not found');
- }
+ public function validate($id, $idwarehouse=0)
+ {
+ if(! DolibarrApiAccess::$user->rights->expensereport->creer) {
+ throw new RestException(401);
+ }
+ $result = $this->expensereport->fetch($id);
+ if( ! $result ) {
+ throw new RestException(404, 'expensereport not found');
+ }
- if( ! DolibarrApi::_checkAccessToResource('expensereport',$this->expensereport->id)) {
- throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
- }
+ if( ! DolibarrApi::_checkAccessToResource('expensereport',$this->expensereport->id)) {
+ throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+ }
- if( ! $this->expensereport->valid(DolibarrApiAccess::$user, $idwarehouse)) {
- throw new RestException(500, 'Error when validate expensereport');
- }
+ if( ! $this->expensereport->valid(DolibarrApiAccess::$user, $idwarehouse)) {
+ throw new RestException(500, 'Error when validate expensereport');
+ }
- return array(
- 'success' => array(
- 'code' => 200,
- 'message' => 'expensereport validated'
- )
- );
- }*/
+ return array(
+ 'success' => array(
+ 'code' => 200,
+ 'message' => 'expensereport validated'
+ )
+ );
+ }*/
// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
/**
@@ -555,8 +555,9 @@ class ExpenseReports extends DolibarrApi
{
$expensereport = array();
foreach (ExpenseReports::$FIELDS as $field) {
- if (!isset($data[$field]))
+ if (!isset($data[$field])) {
throw new RestException(400, "$field field missing");
+ }
$expensereport[$field] = $data[$field];
}
return $expensereport;
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index cdc4fe4da5d..f95302cdba2 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -237,14 +237,15 @@ class ExpenseReport extends CommonObject
$error = 0;
// Check parameters
- if (empty($this->date_debut) || empty($this->date_fin))
- {
+ if (empty($this->date_debut) || empty($this->date_fin)) {
$this->error = $langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Date'));
return -1;
}
$fuserid = $this->fk_user_author; // Note fk_user_author is not the 'author' but the guy the expense report is for.
- if (empty($fuserid)) $fuserid = $user->id;
+ if (empty($fuserid)) {
+ $fuserid = $user->id;
+ }
$this->db->begin();
@@ -289,25 +290,20 @@ class ExpenseReport extends CommonObject
$sql .= ")";
$result = $this->db->query($sql);
- if ($result)
- {
+ if ($result) {
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.$this->table_element);
$this->ref = '(PROV'.$this->id.')';
$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element." SET ref='".$this->db->escape($this->ref)."' WHERE rowid=".$this->id;
$resql = $this->db->query($sql);
- if (!$resql)
- {
+ if (!$resql) {
$this->error = $this->db->lasterror();
$error++;
}
- if (!$error)
- {
- if (is_array($this->lines) && count($this->lines) > 0)
- {
- foreach ($this->lines as $line)
- {
+ if (!$error) {
+ if (is_array($this->lines) && count($this->lines) > 0) {
+ foreach ($this->lines as $line) {
// Test and convert into object this->lines[$i]. When coming from REST API, we may still have an array
//if (! is_object($line)) $line=json_decode(json_encode($line), false); // convert recursively array into object.
if (!is_object($line)) {
@@ -334,8 +330,7 @@ class ExpenseReport extends CommonObject
//$newndfline=new ExpenseReportLine($this->db);
$newndfline->fk_expensereport = $this->id;
$result = $newndfline->insert();
- if ($result < 0)
- {
+ if ($result < 0) {
$this->error = $newndfline->error;
$this->errors = $newndfline->errors;
$error++;
@@ -345,19 +340,17 @@ class ExpenseReport extends CommonObject
}
}
- if (!$error)
- {
+ if (!$error) {
$result = $this->insertExtraFields();
- if ($result < 0) $error++;
+ if ($result < 0) {
+ $error++;
+ }
}
- if (!$error)
- {
+ if (!$error) {
$result = $this->update_price();
- if ($result > 0)
- {
- if (!$notrigger)
- {
+ if ($result > 0) {
+ if (!$notrigger) {
// Call trigger
$result = $this->call_trigger('EXPENSE_REPORT_CREATE', $user);
@@ -367,8 +360,7 @@ class ExpenseReport extends CommonObject
// End call triggers
}
- if (empty($error))
- {
+ if (empty($error)) {
$this->db->commit();
return $this->id;
} else {
@@ -405,7 +397,9 @@ class ExpenseReport extends CommonObject
$error = 0;
- if (empty($fk_user_author)) $fk_user_author = $user->id;
+ if (empty($fk_user_author)) {
+ $fk_user_author = $user->id;
+ }
$this->db->begin();
@@ -430,10 +424,8 @@ class ExpenseReport extends CommonObject
$this->date_validation = '';
// Remove link on lines to a joined file
- if (is_array($this->lines) && count($this->lines) > 0)
- {
- foreach ($this->lines as $key => $line)
- {
+ if (is_array($this->lines) && count($this->lines) > 0) {
+ foreach ($this->lines as $key => $line) {
$this->lines[$key]->fk_ecm_files = 0;
}
}
@@ -441,25 +433,26 @@ class ExpenseReport extends CommonObject
// Create clone
$this->context['createfromclone'] = 'createfromclone';
$result = $this->create($user);
- if ($result < 0) $error++;
+ if ($result < 0) {
+ $error++;
+ }
- if (!$error)
- {
+ if (!$error) {
// Hook of thirdparty module
- if (is_object($hookmanager))
- {
+ if (is_object($hookmanager)) {
$parameters = array('objFrom'=>$objFrom);
$action = '';
$reshook = $hookmanager->executeHooks('createFrom', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
- if ($reshook < 0) $error++;
+ if ($reshook < 0) {
+ $error++;
+ }
}
}
unset($this->context['createfromclone']);
// End
- if (!$error)
- {
+ if (!$error) {
$this->db->commit();
return $this->id;
} else {
@@ -490,8 +483,7 @@ class ExpenseReport extends CommonObject
$sql .= " , total_tva = ".$this->total_tva;
$sql .= " , date_debut = '".$this->db->idate($this->date_debut)."'";
$sql .= " , date_fin = '".$this->db->idate($this->date_fin)."'";
- if ($userofexpensereport && is_object($userofexpensereport))
- {
+ if ($userofexpensereport && is_object($userofexpensereport)) {
$sql .= " , fk_user_author = ".($userofexpensereport->id > 0 ? $userofexpensereport->id : "null"); // Note fk_user_author is not the 'author' but the guy the expense report is for.
}
$sql .= " , fk_user_validator = ".($this->fk_user_validator > 0 ? $this->fk_user_validator : "null");
@@ -507,10 +499,8 @@ class ExpenseReport extends CommonObject
dol_syslog(get_class($this)."::update sql=".$sql, LOG_DEBUG);
$result = $this->db->query($sql);
- if ($result)
- {
- if (!$notrigger)
- {
+ if ($result) {
+ if (!$notrigger) {
// Call trigger
$result = $this->call_trigger('EXPENSE_REPORT_UPDATE', $user);
@@ -520,8 +510,7 @@ class ExpenseReport extends CommonObject
// End call triggers
}
- if (empty($error))
- {
+ if (empty($error)) {
$this->db->commit();
return 1;
} else {
@@ -556,17 +545,18 @@ class ExpenseReport extends CommonObject
$sql .= " d.fk_user_valid, d.fk_user_approve,";
$sql .= " d.fk_statut as status, d.fk_c_paiement, d.paid";
$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as d";
- if ($ref) $sql .= " WHERE d.ref = '".$this->db->escape($ref)."'";
- else $sql .= " WHERE d.rowid = ".$id;
+ if ($ref) {
+ $sql .= " WHERE d.ref = '".$this->db->escape($ref)."'";
+ } else {
+ $sql .= " WHERE d.rowid = ".$id;
+ }
//$sql.= $restrict;
dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
$resql = $this->db->query($sql);
- if ($resql)
- {
+ if ($resql) {
$obj = $this->db->fetch_object($resql);
- if ($obj)
- {
+ if ($obj) {
$this->id = $obj->rowid;
$this->ref = $obj->ref;
@@ -599,13 +589,18 @@ class ExpenseReport extends CommonObject
$this->fk_user_approve = $obj->fk_user_approve;
$user_author = new User($this->db);
- if ($this->fk_user_author > 0) $user_author->fetch($this->fk_user_author);
+ if ($this->fk_user_author > 0) {
+ $user_author->fetch($this->fk_user_author);
+ }
$this->user_author_infos = dolGetFirstLastname($user_author->firstname, $user_author->lastname);
$user_approver = new User($this->db);
- if ($this->fk_user_approve > 0) $user_approver->fetch($this->fk_user_approve);
- elseif ($this->fk_user_validator > 0) $user_approver->fetch($this->fk_user_validator); // For backward compatibility
+ if ($this->fk_user_approve > 0) {
+ $user_approver->fetch($this->fk_user_approve);
+ } elseif ($this->fk_user_validator > 0) {
+ $user_approver->fetch($this->fk_user_validator); // For backward compatibility
+ }
$this->user_validator_infos = dolGetFirstLastname($user_approver->firstname, $user_approver->lastname);
$this->fk_statut = $obj->status; // deprecated
@@ -613,10 +608,11 @@ class ExpenseReport extends CommonObject
$this->fk_c_paiement = $obj->fk_c_paiement;
$this->paid = $obj->paid;
- if ($this->status == self::STATUS_APPROVED || $this->status == self::STATUS_CLOSED)
- {
+ if ($this->status == self::STATUS_APPROVED || $this->status == self::STATUS_CLOSED) {
$user_valid = new User($this->db);
- if ($this->fk_user_valid > 0) $user_valid->fetch($this->fk_user_valid);
+ if ($this->fk_user_valid > 0) {
+ $user_valid->fetch($this->fk_user_valid);
+ }
$this->user_valid_infos = dolGetFirstLastname($user_valid->firstname, $user_valid->lastname);
}
@@ -671,12 +667,9 @@ class ExpenseReport extends CommonObject
dol_syslog(get_class($this)."::set_paid sql=".$sql, LOG_DEBUG);
$resql = $this->db->query($sql);
- if ($resql)
- {
- if ($this->db->affected_rows($resql))
- {
- if (!$notrigger)
- {
+ if ($resql) {
+ if ($this->db->affected_rows($resql)) {
+ if (!$notrigger) {
// Call trigger
$result = $this->call_trigger('EXPENSE_REPORT_PAID', $fuser);
@@ -686,8 +679,7 @@ class ExpenseReport extends CommonObject
// End call triggers
}
- if (empty($error))
- {
+ if (empty($error)) {
$this->db->commit();
return 1;
} else {
@@ -763,10 +755,8 @@ class ExpenseReport extends CommonObject
$sql .= " AND f.entity = ".$conf->entity;
$resql = $this->db->query($sql);
- if ($resql)
- {
- if ($this->db->num_rows($resql))
- {
+ if ($resql) {
+ if ($this->db->num_rows($resql)) {
$obj = $this->db->fetch_object($resql);
$this->id = $obj->rowid;
@@ -780,26 +770,22 @@ class ExpenseReport extends CommonObject
$cuser->fetch($obj->fk_user_author);
$this->user_creation = $cuser;
- if ($obj->fk_user_creation)
- {
+ if ($obj->fk_user_creation) {
$cuser = new User($this->db);
$cuser->fetch($obj->fk_user_creation);
$this->user_creation = $cuser;
}
- if ($obj->fk_user_valid)
- {
+ if ($obj->fk_user_valid) {
$vuser = new User($this->db);
$vuser->fetch($obj->fk_user_valid);
$this->user_validation = $vuser;
}
- if ($obj->fk_user_modification)
- {
+ if ($obj->fk_user_modification) {
$muser = new User($this->db);
$muser->fetch($obj->fk_user_modification);
$this->user_modification = $muser;
}
- if ($obj->fk_user_approve)
- {
+ if ($obj->fk_user_approve) {
$auser = new User($this->db);
$auser->fetch($obj->fk_user_approve);
$this->user_approve = $auser;
@@ -898,15 +884,13 @@ class ExpenseReport extends CommonObject
dol_syslog(get_class($this)."::fetch sql=".$sql, LOG_DEBUG);
$result = $this->db->query($sql);
- if ($result)
- {
+ if ($result) {
$num = $this->db->num_rows($result);
$i = 0;
$total_HT = 0;
$total_TTC = 0;
- while ($i < $num)
- {
+ while ($i < $num) {
$objp = $this->db->fetch_object($result);
$sql2 = "SELECT d.rowid, d.fk_user_author, d.ref, d.fk_statut as status";
@@ -953,13 +937,13 @@ class ExpenseReport extends CommonObject
break;
}
/*
- if ($status==4) return img_picto($langs->trans('StatusOrderCanceled'),'statut5');
- if ($status==1) return img_picto($langs->trans('StatusOrderDraft'),'statut0');
- if ($status==2) return img_picto($langs->trans('StatusOrderValidated'),'statut1');
- if ($status==2) return img_picto($langs->trans('StatusOrderOnProcess'),'statut3');
- if ($status==5) return img_picto($langs->trans('StatusOrderToBill'),'statut4');
- if ($status==6) return img_picto($langs->trans('StatusOrderOnProcess'),'statut6');
- */
+ if ($status==4) return img_picto($langs->trans('StatusOrderCanceled'),'statut5');
+ if ($status==1) return img_picto($langs->trans('StatusOrderDraft'),'statut0');
+ if ($status==2) return img_picto($langs->trans('StatusOrderValidated'),'statut1');
+ if ($status==2) return img_picto($langs->trans('StatusOrderOnProcess'),'statut3');
+ if ($status==5) return img_picto($langs->trans('StatusOrderToBill'),'statut4');
+ if ($status==6) return img_picto($langs->trans('StatusOrderOnProcess'),'statut6');
+ */
print '';
print '';
@@ -994,11 +978,10 @@ class ExpenseReport extends CommonObject
$total_ht = 0; $total_tva = 0; $total_ttc = 0;
$result = $this->db->query($sql);
- if ($result)
- {
+ if ($result) {
$num = $this->db->num_rows($result);
$i = 0;
- while ($i < $num):
+ while ($i < $num) :
$objp = $this->db->fetch_object($result);
$total_ht += $objp->total_ht;
$total_tva += $objp->total_tva;
@@ -1012,7 +995,7 @@ class ExpenseReport extends CommonObject
$sql .= " , total_tva = ".$total_tva;
$sql .= " WHERE rowid = ".$id;
$result = $this->db->query($sql);
- if ($result):
+ if ($result) :
$this->db->free($result);
return 1;
else :
@@ -1049,20 +1032,17 @@ class ExpenseReport extends CommonObject
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_type_fees as ctf ON de.fk_c_type_fees = ctf.id';
$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'projet as p ON de.fk_projet = p.rowid';
$sql .= ' WHERE de.'.$this->fk_element.' = '.$this->id;
- if (!empty($conf->global->EXPENSEREPORT_LINES_SORTED_BY_ROWID))
- {
+ if (!empty($conf->global->EXPENSEREPORT_LINES_SORTED_BY_ROWID)) {
$sql .= ' ORDER BY de.rang ASC, de.rowid ASC';
} else {
$sql .= ' ORDER BY de.rang ASC, de.date ASC';
}
$resql = $this->db->query($sql);
- if ($resql)
- {
+ if ($resql) {
$num = $this->db->num_rows($resql);
$i = 0;
- while ($i < $num)
- {
+ while ($i < $num) {
$objp = $this->db->fetch_object($resql);
$deplig = new ExpenseReportLine($this->db);
@@ -1128,7 +1108,9 @@ class ExpenseReport extends CommonObject
if (!$notrigger) {
// Call trigger
$result = $this->call_trigger('EXPENSEREPORT_DELETE', $user);
- if ($result < 0) { $error++; }
+ if ($result < 0) {
+ $error++;
+ }
// End call triggers
}
@@ -1148,13 +1130,17 @@ class ExpenseReport extends CommonObject
if (!$error) {
// Delete linked object
$res = $this->deleteObjectLinked();
- if ($res < 0) $error++;
+ if ($res < 0) {
+ $error++;
+ }
}
if (!$error) {
// Delete linked contacts
$res = $this->delete_linked_contact();
- if ($res < 0) $error++;
+ if ($res < 0) {
+ $error++;
+ }
}
// Removed extrafields of object
@@ -1239,8 +1225,7 @@ class ExpenseReport extends CommonObject
$now = dol_now();
// Protection
- if ($this->status == self::STATUS_VALIDATED)
- {
+ if ($this->status == self::STATUS_VALIDATED) {
dol_syslog(get_class($this)."::valid action abandonned: already validated", LOG_WARNING);
return 0;
}
@@ -1248,13 +1233,14 @@ class ExpenseReport extends CommonObject
$this->date_valid = $now; // Required for the getNextNum later.
// Define new ref
- if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) // empty should not happened, but when it occurs, the test save life
- {
+ if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) { // empty should not happened, but when it occurs, the test save life
$num = $this->getNextNumRef();
} else {
$num = $this->ref;
}
- if (empty($num) || $num < 0) return -1;
+ if (empty($num) || $num < 0) {
+ return -1;
+ }
$this->newref = dol_sanitizeFileName($num);
@@ -1269,10 +1255,8 @@ class ExpenseReport extends CommonObject
$sql .= " WHERE rowid = ".$this->id;
$resql = $this->db->query($sql);
- if ($resql)
- {
- if (!$error && !$notrigger)
- {
+ if ($resql) {
+ if (!$error && !$notrigger) {
// Call trigger
$result = $this->call_trigger('EXPENSE_REPORT_VALIDATE', $fuser);
if ($result < 0) {
@@ -1281,37 +1265,34 @@ class ExpenseReport extends CommonObject
// End call triggers
}
- if (!$error)
- {
+ if (!$error) {
$this->oldref = $this->ref;
// Rename directory if dir was a temporary ref
- if (preg_match('/^[\(]?PROV/i', $this->ref))
- {
+ if (preg_match('/^[\(]?PROV/i', $this->ref)) {
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
// Now we rename also files into index
$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref) + 1).")), filepath = 'expensereport/".$this->db->escape($this->newref)."'";
$sql .= " WHERE filename LIKE '".$this->db->escape($this->ref)."%' AND filepath = 'expensereport/".$this->db->escape($this->ref)."' and entity = ".$conf->entity;
$resql = $this->db->query($sql);
- if (!$resql) { $error++; $this->error = $this->db->lasterror(); }
+ if (!$resql) {
+ $error++; $this->error = $this->db->lasterror();
+ }
// We rename directory ($this->ref = old ref, $num = new ref) in order not to lose the attachments
$oldref = dol_sanitizeFileName($this->ref);
$newref = dol_sanitizeFileName($num);
$dirsource = $conf->expensereport->dir_output.'/'.$oldref;
$dirdest = $conf->expensereport->dir_output.'/'.$newref;
- if (!$error && file_exists($dirsource))
- {
+ if (!$error && file_exists($dirsource)) {
dol_syslog(get_class($this)."::setValidate() rename dir ".$dirsource." into ".$dirdest);
- if (@rename($dirsource, $dirdest))
- {
+ if (@rename($dirsource, $dirdest)) {
dol_syslog("Rename ok");
// Rename docs starting with $oldref with $newref
$listoffiles = dol_dir_list($conf->expensereport->dir_output.'/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
- foreach ($listoffiles as $fileentry)
- {
+ foreach ($listoffiles as $fileentry) {
$dirsource = $fileentry['name'];
$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
$dirsource = $fileentry['path'].'/'.$dirsource;
@@ -1324,14 +1305,12 @@ class ExpenseReport extends CommonObject
}
// Set new ref and current status
- if (!$error)
- {
+ if (!$error) {
$this->ref = $num;
$this->status = self::STATUS_VALIDATED;
}
- if (empty($error))
- {
+ if (empty($error)) {
$this->db->commit();
return 1;
} else {
@@ -1369,16 +1348,14 @@ class ExpenseReport extends CommonObject
$this->date_debut = $this->db->jdate($objp->date_debut);
- if ($this->status != self::STATUS_VALIDATED)
- {
+ if ($this->status != self::STATUS_VALIDATED) {
$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
$sql .= " SET fk_statut = ".self::STATUS_VALIDATED;
$sql .= ' WHERE rowid = '.$this->id;
dol_syslog(get_class($this)."::set_save_from_refuse sql=".$sql, LOG_DEBUG);
- if ($this->db->query($sql))
- {
+ if ($this->db->query($sql)) {
return 1;
} else {
$this->error = $this->db->lasterror();
@@ -1403,18 +1380,15 @@ class ExpenseReport extends CommonObject
// date approval
$this->date_approve = $now;
- if ($this->status != self::STATUS_APPROVED)
- {
+ if ($this->status != self::STATUS_APPROVED) {
$this->db->begin();
$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
$sql .= " SET ref = '".$this->db->escape($this->ref)."', fk_statut = ".self::STATUS_APPROVED.", fk_user_approve = ".$fuser->id.",";
$sql .= " date_approve='".$this->db->idate($this->date_approve)."'";
$sql .= ' WHERE rowid = '.$this->id;
- if ($this->db->query($sql))
- {
- if (!$notrigger)
- {
+ if ($this->db->query($sql)) {
+ if (!$notrigger) {
// Call trigger
$result = $this->call_trigger('EXPENSE_REPORT_APPROVE', $fuser);
@@ -1424,8 +1398,7 @@ class ExpenseReport extends CommonObject
// End call triggers
}
- if (empty($error))
- {
+ if (empty($error)) {
$this->db->commit();
return 1;
} else {
@@ -1459,24 +1432,21 @@ class ExpenseReport extends CommonObject
$error = 0;
// date de refus
- if ($this->status != self::STATUS_REFUSED)
- {
+ if ($this->status != self::STATUS_REFUSED) {
$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
$sql .= " SET ref = '".$this->db->escape($this->ref)."', fk_statut = ".self::STATUS_REFUSED.", fk_user_refuse = ".$fuser->id.",";
$sql .= " date_refuse='".$this->db->idate($now)."',";
$sql .= " detail_refuse='".$this->db->escape($details)."',";
$sql .= " fk_user_approve = NULL";
$sql .= ' WHERE rowid = '.$this->id;
- if ($this->db->query($sql))
- {
+ if ($this->db->query($sql)) {
$this->fk_statut = 99; // deprecated
$this->status = 99;
$this->fk_user_refuse = $fuser->id;
$this->detail_refuse = $details;
$this->date_refuse = $now;
- if (!$notrigger)
- {
+ if (!$notrigger) {
// Call trigger
$result = $this->call_trigger('EXPENSE_REPORT_DENY', $fuser);
@@ -1486,8 +1456,7 @@ class ExpenseReport extends CommonObject
// End call triggers
}
- if (empty($error))
- {
+ if (empty($error)) {
$this->db->commit();
return 1;
} else {
@@ -1533,8 +1502,7 @@ class ExpenseReport extends CommonObject
{
$error = 0;
- if ($this->paid)
- {
+ if ($this->paid) {
$this->db->begin();
$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
@@ -1543,10 +1511,8 @@ class ExpenseReport extends CommonObject
dol_syslog(get_class($this)."::set_unpaid sql=".$sql, LOG_DEBUG);
- if ($this->db->query($sql))
- {
- if (!$notrigger)
- {
+ if ($this->db->query($sql)) {
+ if (!$notrigger) {
// Call trigger
$result = $this->call_trigger('EXPENSE_REPORT_UNPAID', $fuser);
@@ -1556,8 +1522,7 @@ class ExpenseReport extends CommonObject
// End call triggers
}
- if (empty($error))
- {
+ if (empty($error)) {
$this->db->commit();
return 1;
} else {
@@ -1589,8 +1554,7 @@ class ExpenseReport extends CommonObject
// phpcs:enable
$error = 0;
$this->date_cancel = $this->db->idate(dol_now());
- if ($this->status != self::STATUS_CANCELED)
- {
+ if ($this->status != self::STATUS_CANCELED) {
$this->db->begin();
$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
@@ -1601,10 +1565,8 @@ class ExpenseReport extends CommonObject
dol_syslog(get_class($this)."::set_cancel sql=".$sql, LOG_DEBUG);
- if ($this->db->query($sql))
- {
- if (!$notrigger)
- {
+ if ($this->db->query($sql)) {
+ if (!$notrigger) {
// Call trigger
$result = $this->call_trigger('EXPENSE_REPORT_CANCEL', $fuser);
@@ -1614,8 +1576,7 @@ class ExpenseReport extends CommonObject
// End call triggers
}
- if (empty($error))
- {
+ if (empty($error)) {
$this->db->commit();
return 1;
} else {
@@ -1643,8 +1604,7 @@ class ExpenseReport extends CommonObject
global $langs, $conf;
$langs->load("trips");
- if (!empty($conf->global->EXPENSEREPORT_ADDON))
- {
+ if (!empty($conf->global->EXPENSEREPORT_ADDON)) {
$mybool = false;
$file = $conf->global->EXPENSEREPORT_ADDON.".php";
@@ -1652,8 +1612,7 @@ class ExpenseReport extends CommonObject
// Include file with class
$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
- foreach ($dirmodels as $reldir)
- {
+ foreach ($dirmodels as $reldir) {
$dir = dol_buildpath($reldir."core/modules/expensereport/");
// Load file with numbering class (if found)
@@ -1668,8 +1627,7 @@ class ExpenseReport extends CommonObject
$obj = new $classname();
$numref = $obj->getNextValue($this);
- if ($numref != "")
- {
+ if ($numref != "") {
return $numref;
} else {
$this->error = $obj->error;
@@ -1702,38 +1660,50 @@ class ExpenseReport extends CommonObject
$url = DOL_URL_ROOT.'/expensereport/card.php?id='.$this->id;
- if ($short) return $url;
+ if ($short) {
+ return $url;
+ }
$label = img_picto('', $this->picto).'
'.$langs->trans("ExpenseReport").'';
if (isset($this->status)) {
$label .= ' '.$this->getLibStatut(5);
}
- if (!empty($this->ref))
+ if (!empty($this->ref)) {
$label .= '
'.$langs->trans('Ref').': '.$this->ref;
- if (!empty($this->total_ht))
+ }
+ if (!empty($this->total_ht)) {
$label .= '
'.$langs->trans('AmountHT').': '.price($this->total_ht, 0, $langs, 0, -1, -1, $conf->currency);
- if (!empty($this->total_tva))
+ }
+ if (!empty($this->total_tva)) {
$label .= '
'.$langs->trans('VAT').': '.price($this->total_tva, 0, $langs, 0, -1, -1, $conf->currency);
- if (!empty($this->total_ttc))
+ }
+ if (!empty($this->total_ttc)) {
$label .= '
'.$langs->trans('AmountTTC').': '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
- if ($moretitle) $label .= ' - '.$moretitle;
+ }
+ if ($moretitle) {
+ $label .= ' - '.$moretitle;
+ }
//if ($option != 'nolink')
//{
// Add param to save lastsearch_values or not
$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
- if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
- if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+ if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+ $add_save_lastsearch_values = 1;
+ }
+ if ($add_save_lastsearch_values) {
+ $url .= '&save_lastsearch_values=1';
+ }
//}
$ref = $this->ref;
- if (empty($ref)) $ref = $this->id;
+ if (empty($ref)) {
+ $ref = $this->id;
+ }
$linkclose = '';
- if (empty($notooltip))
- {
- if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER))
- {
+ if (empty($notooltip)) {
+ if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
$label = $langs->trans("ShowExpenseReport");
$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
}
@@ -1746,8 +1716,12 @@ class ExpenseReport extends CommonObject
$linkend = '';
$result .= $linkstart;
- if ($withpicto) $result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
- if ($withpicto != 2) $result .= ($max ?dol_trunc($ref, $max) : $ref);
+ if ($withpicto) {
+ $result .= img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+ }
+ if ($withpicto != 2) {
+ $result .= ($max ?dol_trunc($ref, $max) : $ref);
+ }
$result .= $linkend;
return $result;
@@ -1775,7 +1749,7 @@ class ExpenseReport extends CommonObject
$sql .= " WHERE rowid = ".$this->id;
$result = $this->db->query($sql);
- if ($result):
+ if ($result) :
return 1;
else :
$this->error = $this->db->error();
@@ -1805,7 +1779,7 @@ class ExpenseReport extends CommonObject
$sql .= " WHERE rowid = ".$this->id;
$result = $this->db->query($sql);
- if ($result):
+ if ($result) :
return 1;
else :
$this->error = $this->db->error();
@@ -1834,14 +1808,25 @@ class ExpenseReport extends CommonObject
dol_syslog(get_class($this)."::addline qty=$qty, up=$up, fk_c_type_fees=$fk_c_type_fees, vatrate=$vatrate, date=$date, fk_project=$fk_project, type=$type, comments=$comments", LOG_DEBUG);
- if ($this->status == self::STATUS_DRAFT)
- {
- if (empty($qty)) $qty = 0;
- if (empty($fk_c_type_fees) || $fk_c_type_fees < 0) $fk_c_type_fees = 0;
- if (empty($fk_c_exp_tax_cat) || $fk_c_exp_tax_cat < 0) $fk_c_exp_tax_cat = 0;
- if (empty($vatrate) || $vatrate < 0) $vatrate = 0;
- if (empty($date)) $date = '';
- if (empty($fk_project)) $fk_project = 0;
+ if ($this->status == self::STATUS_DRAFT) {
+ if (empty($qty)) {
+ $qty = 0;
+ }
+ if (empty($fk_c_type_fees) || $fk_c_type_fees < 0) {
+ $fk_c_type_fees = 0;
+ }
+ if (empty($fk_c_exp_tax_cat) || $fk_c_exp_tax_cat < 0) {
+ $fk_c_exp_tax_cat = 0;
+ }
+ if (empty($vatrate) || $vatrate < 0) {
+ $vatrate = 0;
+ }
+ if (empty($date)) {
+ $date = '';
+ }
+ if (empty($fk_project)) {
+ $fk_project = 0;
+ }
$qty = price2num($qty);
if (!preg_match('/\s*\((.*)\)/', $vatrate)) {
@@ -1857,8 +1842,7 @@ class ExpenseReport extends CommonObject
$vat_src_code = '';
$reg = array();
- if (preg_match('/\s*\((.*)\)/', $vatrate, $reg))
- {
+ if (preg_match('/\s*\((.*)\)/', $vatrate, $reg)) {
$vat_src_code = $reg[1];
$vatrate = preg_replace('/\s*\(.*\)/', '', $vatrate); // Remove code into vatrate.
}
@@ -1890,11 +1874,9 @@ class ExpenseReport extends CommonObject
$this->checkRules($type, $seller);
$result = $this->line->insert(0, true);
- if ($result > 0)
- {
+ if ($result > 0) {
$result = $this->update_price(); // This method is designed to add line from user input so total calculation must be done using 'auto' mode.
- if ($result > 0)
- {
+ if ($result > 0) {
$this->db->commit();
return $this->line->id;
} else {
@@ -1927,7 +1909,9 @@ class ExpenseReport extends CommonObject
$langs->load('trips');
- if (empty($conf->global->MAIN_USE_EXPENSE_RULE)) return true; // if don't use rules
+ if (empty($conf->global->MAIN_USE_EXPENSE_RULE)) {
+ return true; // if don't use rules
+ }
$rulestocheck = ExpenseReportRule::getAllRule($this->line->fk_c_type_fees, $this->line->date, $this->fk_user_author);
@@ -1938,19 +1922,19 @@ class ExpenseReport extends CommonObject
$new_current_total_ttc = $this->line->total_ttc;
// check if one is violated
- foreach ($rulestocheck as $rule)
- {
- if (in_array($rule->code_expense_rules_type, array('EX_DAY', 'EX_MON', 'EX_YEA'))) $amount_to_test = $this->line->getExpAmount($rule, $this->fk_user_author, $rule->code_expense_rules_type);
- else $amount_to_test = $current_total_ttc; // EX_EXP
+ foreach ($rulestocheck as $rule) {
+ if (in_array($rule->code_expense_rules_type, array('EX_DAY', 'EX_MON', 'EX_YEA'))) {
+ $amount_to_test = $this->line->getExpAmount($rule, $this->fk_user_author, $rule->code_expense_rules_type);
+ } else {
+ $amount_to_test = $current_total_ttc; // EX_EXP
+ }
$amount_to_test = $amount_to_test - $current_total_ttc + $new_current_total_ttc; // if amount as been modified by a previous rule
- if ($amount_to_test > $rule->amount)
- {
+ if ($amount_to_test > $rule->amount) {
$violation++;
- if ($rule->restrictive)
- {
+ if ($rule->restrictive) {
$this->error = 'ExpenseReportConstraintViolationError';
$this->errors[] = $this->error;
@@ -1969,8 +1953,7 @@ class ExpenseReport extends CommonObject
$this->line->rule_warning_message = implode('\n', $rule_warning_message_tab);
- if ($violation > 0)
- {
+ if ($violation > 0) {
$tmp = calcul_price_total($this->line->qty, $new_current_total_ttc / $this->line->qty, 0, $this->line->vatrate, 0, 0, 0, 'TTC', 0, $type, $seller);
$this->line->value_unit = $tmp[5];
@@ -1979,7 +1962,9 @@ class ExpenseReport extends CommonObject
$this->line->total_tva = $tmp[1];
return false;
- } else return true;
+ } else {
+ return true;
+ }
}
/**
@@ -1991,11 +1976,12 @@ class ExpenseReport extends CommonObject
{
global $conf;
- if (empty($conf->global->MAIN_USE_EXPENSE_IK)) return false;
+ if (empty($conf->global->MAIN_USE_EXPENSE_IK)) {
+ return false;
+ }
$userauthor = new User($this->db);
- if ($userauthor->fetch($this->fk_user_author) <= 0)
- {
+ if ($userauthor->fetch($this->fk_user_author) <= 0) {
$this->error = 'ErrorCantFetchUser';
$this->errors[] = 'ErrorCantFetchUser';
return false;
@@ -2003,19 +1989,20 @@ class ExpenseReport extends CommonObject
$range = ExpenseReportIk::getRangeByUser($userauthor, $this->line->fk_c_exp_tax_cat);
- if (empty($range))
- {
+ if (empty($range)) {
$this->error = 'ErrorNoRangeAvailable';
$this->errors[] = 'ErrorNoRangeAvailable';
return false;
}
- if (!empty($conf->global->MAIN_EXPENSE_APPLY_ENTIRE_OFFSET)) $ikoffset = $range->ikoffset;
- else $ikoffset = $range->ikoffset / 12; // The amount of offset is a global value for the year
+ if (!empty($conf->global->MAIN_EXPENSE_APPLY_ENTIRE_OFFSET)) {
+ $ikoffset = $range->ikoffset;
+ } else {
+ $ikoffset = $range->ikoffset / 12; // The amount of offset is a global value for the year
+ }
// Test if ikoffset has been applied for the current month
- if (!$this->offsetAlreadyGiven())
- {
+ if (!$this->offsetAlreadyGiven()) {
$new_up = $range->coef + ($ikoffset / $this->line->qty);
$tmp = calcul_price_total($this->line->qty, $new_up, 0, $this->line->vatrate, 0, 0, 0, 'TTC', 0, $type, $seller);
@@ -2042,14 +2029,17 @@ class ExpenseReport extends CommonObject
$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'c_type_fees f ON (d.fk_c_type_fees = f.id AND f.code = "EX_KME")';
$sql .= ' WHERE e.fk_user_author = '.(int) $this->fk_user_author;
$sql .= ' AND YEAR(d.date) = "'.dol_print_date($this->line->date, '%Y').'" AND MONTH(d.date) = "'.dol_print_date($this->line->date, '%m').'"';
- if (!empty($this->line->id)) $sql .= ' AND d.rowid <> '.$this->line->id;
+ if (!empty($this->line->id)) {
+ $sql .= ' AND d.rowid <> '.$this->line->id;
+ }
dol_syslog(get_class($this)."::offsetAlreadyGiven sql=".$sql);
$resql = $this->db->query($sql);
- if ($resql)
- {
+ if ($resql) {
$num = $this->db->num_rows($resql);
- if ($num > 0) return true;
+ if ($num > 0) {
+ return true;
+ }
} else {
dol_print_error($this->db);
}
@@ -2077,8 +2067,7 @@ class ExpenseReport extends CommonObject
{
global $user, $mysoc;
- if ($this->status == self::STATUS_DRAFT || $this->status == self::STATUS_REFUSED)
- {
+ if ($this->status == self::STATUS_DRAFT || $this->status == self::STATUS_REFUSED) {
$this->db->begin();
$type = 0; // TODO What if type is service ?
@@ -2092,8 +2081,7 @@ class ExpenseReport extends CommonObject
// Clean vat code
$reg = array();
$vat_src_code = '';
- if (preg_match('/\((.*)\)/', $vatrate, $reg))
- {
+ if (preg_match('/\((.*)\)/', $vatrate, $reg)) {
$vat_src_code = $reg[1];
$vatrate = preg_replace('/\s*\(.*\)/', '', $vatrate); // Remove code into vatrate.
}
@@ -2138,8 +2126,7 @@ class ExpenseReport extends CommonObject
$sql .= " FROM ".MAIN_DB_PREFIX."c_type_fees as c";
$sql .= " WHERE c.id = ".$type_fees_id;
$resql = $this->db->query($sql);
- if ($resql)
- {
+ if ($resql) {
$objp_fees = $this->db->fetch_object($resql);
$this->line->type_fees_code = $objp_fees->code_type_fees;
$this->line->type_fees_libelle = $objp_fees->libelle_type_fees;
@@ -2162,8 +2149,7 @@ class ExpenseReport extends CommonObject
$this->checkRules();
$result = $this->line->update($user);
- if ($result > 0)
- {
+ if ($result > 0) {
$this->db->commit();
return 1;
} else {
@@ -2191,8 +2177,7 @@ class ExpenseReport extends CommonObject
dol_syslog(get_class($this)."::deleteline sql=".$sql);
$result = $this->db->query($sql);
- if (!$result)
- {
+ if (!$result) {
$this->error = $this->db->error();
dol_syslog(get_class($this)."::deleteline Error ".$this->error, LOG_ERR);
$this->db->rollback();
@@ -2225,27 +2210,30 @@ class ExpenseReport extends CommonObject
if ($result) {
$num_rows = $this->db->num_rows($result); $i = 0;
- if ($num_rows > 0)
- {
+ if ($num_rows > 0) {
$date_d_form = $date_debut;
$date_f_form = $date_fin;
$existe = false;
- while ($i < $num_rows)
- {
+ while ($i < $num_rows) {
$objp = $this->db->fetch_object($result);
$date_d_req = $this->db->jdate($objp->date_debut); // 3
$date_f_req = $this->db->jdate($objp->date_fin); // 4
- if (!($date_f_form < $date_d_req || $date_d_form > $date_f_req)) $existe = true;
+ if (!($date_f_form < $date_d_req || $date_d_form > $date_f_req)) {
+ $existe = true;
+ }
$i++;
}
- if ($existe) return 1;
- else return 0;
+ if ($existe) {
+ return 1;
+ } else {
+ return 0;
+ }
} else {
return 0;
}
@@ -2280,11 +2268,9 @@ class ExpenseReport extends CommonObject
dol_syslog(get_class($this)."::fetch_users_approver_expensereport sql=".$sql);
$result = $this->db->query($sql);
- if ($result)
- {
+ if ($result) {
$num_rows = $this->db->num_rows($result); $i = 0;
- while ($i < $num_rows)
- {
+ while ($i < $num_rows) {
$objp = $this->db->fetch_object($result);
array_push($users_validator, $objp->fk_user);
$i++;
@@ -2348,12 +2334,10 @@ class ExpenseReport extends CommonObject
$sql .= " WHERE active = ".$active;
dol_syslog(get_class($this)."::listOfTypes", LOG_DEBUG);
$result = $this->db->query($sql);
- if ($result)
- {
+ if ($result) {
$num = $this->db->num_rows($result);
$i = 0;
- while ($i < $num)
- {
+ while ($i < $num) {
$obj = $this->db->fetch_object($result);
$ret[$obj->code] = (($langs->transnoentitiesnoconv($obj->code) != $obj->code) ? $langs->transnoentitiesnoconv($obj->code) : $obj->label);
$i++;
@@ -2381,8 +2365,7 @@ class ExpenseReport extends CommonObject
$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as ex";
$sql .= " WHERE ex.fk_statut > 0";
$sql .= " AND ex.entity IN (".getEntity('expensereport').")";
- if (empty($user->rights->expensereport->readall))
- {
+ if (empty($user->rights->expensereport->readall)) {
$userchildids = $user->getAllChildIds(1);
$sql .= " AND (ex.fk_user_author IN (".join(',', $userchildids).")";
$sql .= " OR ex.fk_user_validator IN (".join(',', $userchildids)."))";
@@ -2415,30 +2398,32 @@ class ExpenseReport extends CommonObject
// phpcs:enable
global $conf, $langs;
- if ($user->socid) return -1; // protection pour eviter appel par utilisateur externe
+ if ($user->socid) {
+ return -1; // protection pour eviter appel par utilisateur externe
+ }
$now = dol_now();
$sql = "SELECT ex.rowid, ex.date_valid";
$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as ex";
- if ($option == 'toapprove') $sql .= " WHERE ex.fk_statut = ".self::STATUS_VALIDATED;
- else $sql .= " WHERE ex.fk_statut = ".self::STATUS_APPROVED;
+ if ($option == 'toapprove') {
+ $sql .= " WHERE ex.fk_statut = ".self::STATUS_VALIDATED;
+ } else {
+ $sql .= " WHERE ex.fk_statut = ".self::STATUS_APPROVED;
+ }
$sql .= " AND ex.entity IN (".getEntity('expensereport').")";
- if (empty($user->rights->expensereport->readall))
- {
+ if (empty($user->rights->expensereport->readall)) {
$userchildids = $user->getAllChildIds(1);
$sql .= " AND (ex.fk_user_author IN (".join(',', $userchildids).")";
$sql .= " OR ex.fk_user_validator IN (".join(',', $userchildids)."))";
}
$resql = $this->db->query($sql);
- if ($resql)
- {
+ if ($resql) {
$langs->load("trips");
$response = new WorkboardResponse();
- if ($option == 'toapprove')
- {
+ if ($option == 'toapprove') {
$response->warning_delay = $conf->expensereport->approve->warning_delay / 60 / 60 / 24;
$response->label = $langs->trans("ExpenseReportsToApprove");
$response->labelShort = $langs->trans("ToApprove");
@@ -2451,12 +2436,10 @@ class ExpenseReport extends CommonObject
}
$response->img = img_object('', "trip");
- while ($obj = $this->db->fetch_object($resql))
- {
+ while ($obj = $this->db->fetch_object($resql)) {
$response->nbtodo++;
- if ($option == 'toapprove')
- {
+ if ($option == 'toapprove') {
if ($this->db->jdate($obj->date_valid) < ($now - $conf->expensereport->approve->warning_delay)) {
$response->nbtodolate++;
}
@@ -2486,8 +2469,12 @@ class ExpenseReport extends CommonObject
global $conf;
// Only valid expenses reports
- if ($option == 'toapprove' && $this->status != 2) return false;
- if ($option == 'topay' && $this->status != 5) return false;
+ if ($option == 'toapprove' && $this->status != 2) {
+ return false;
+ }
+ if ($option == 'topay' && $this->status != 5) {
+ return false;
+ }
$now = dol_now();
if ($option == 'toapprove') {
@@ -2510,11 +2497,9 @@ class ExpenseReport extends CommonObject
$sql = " SELECT COUNT(ab.rowid) as nb FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as ab WHERE ab.doc_type='".$this->db->escape($type)."' AND ab.fk_doc = ".$this->id;
$resql = $this->db->query($sql);
- if ($resql)
- {
+ if ($resql) {
$obj = $this->db->fetch_object($resql);
- if ($obj)
- {
+ if ($obj) {
$alreadydispatched = $obj->nb;
}
} else {
@@ -2522,8 +2507,7 @@ class ExpenseReport extends CommonObject
return -1;
}
- if ($alreadydispatched)
- {
+ if ($alreadydispatched) {
return 1;
}
return 0;
@@ -2545,8 +2529,7 @@ class ExpenseReport extends CommonObject
dol_syslog(get_class($this)."::getSumPayments", LOG_DEBUG);
$resql = $this->db->query($sql);
- if ($resql)
- {
+ if ($resql) {
$obj = $this->db->fetch_object($resql);
$this->db->free($resql);
return (empty($obj->amount) ? 0 : $obj->amount);
@@ -2649,8 +2632,7 @@ class ExpenseReportLine
$result = $this->db->query($sql);
- if ($result)
- {
+ if ($result) {
$objp = $this->db->fetch_object($result);
$this->rowid = $objp->rowid;
@@ -2700,10 +2682,14 @@ class ExpenseReportLine
// Clean parameters
$this->comments = trim($this->comments);
- if (empty($this->value_unit)) $this->value_unit = 0;
+ if (empty($this->value_unit)) {
+ $this->value_unit = 0;
+ }
$this->qty = price2num($this->qty);
$this->vatrate = price2num($this->vatrate);
- if (empty($this->fk_c_exp_tax_cat)) $this->fk_c_exp_tax_cat = 0;
+ if (empty($this->fk_c_exp_tax_cat)) {
+ $this->fk_c_exp_tax_cat = 0;
+ }
$this->db->begin();
@@ -2728,17 +2714,14 @@ class ExpenseReportLine
$sql .= ")";
$resql = $this->db->query($sql);
- if ($resql)
- {
+ if ($resql) {
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'expensereport_det');
- if (!$fromaddline)
- {
+ if (!$fromaddline) {
$tmpparent = new ExpenseReport($this->db);
$tmpparent->fetch($this->fk_expensereport);
$result = $tmpparent->update_price();
- if ($result < 0)
- {
+ if ($result < 0) {
$error++;
$this->error = $tmpparent->error;
$this->errors = $tmpparent->errors;
@@ -2748,8 +2731,7 @@ class ExpenseReportLine
$error++;
}
- if (!$error)
- {
+ if (!$error) {
$this->db->commit();
return $this->id;
} else {
@@ -2776,20 +2758,24 @@ class ExpenseReportLine
$sql .= ' FROM '.MAIN_DB_PREFIX.'expensereport_det d';
$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'expensereport e ON (d.fk_expensereport = e.rowid)';
$sql .= ' WHERE e.fk_user_author = '.$fk_user;
- if (!empty($this->id)) $sql .= ' AND d.rowid <> '.$this->id;
+ if (!empty($this->id)) {
+ $sql .= ' AND d.rowid <> '.$this->id;
+ }
$sql .= ' AND d.fk_c_type_fees = '.$rule->fk_c_type_fees;
- if ($mode == 'day' || $mode == 'EX_DAY') $sql .= ' AND d.date = \''.dol_print_date($this->date, '%Y-%m-%d').'\'';
- elseif ($mode == 'mon' || $mode == 'EX_MON') $sql .= ' AND DATE_FORMAT(d.date, \'%Y-%m\') = \''.dol_print_date($this->date, '%Y-%m').'\''; // @todo DATE_FORMAT is forbidden
- elseif ($mode == 'year' || $mode == 'EX_YEA') $sql .= ' AND DATE_FORMAT(d.date, \'%Y\') = \''.dol_print_date($this->date, '%Y').'\''; // @todo DATE_FORMAT is forbidden
+ if ($mode == 'day' || $mode == 'EX_DAY') {
+ $sql .= ' AND d.date = \''.dol_print_date($this->date, '%Y-%m-%d').'\'';
+ } elseif ($mode == 'mon' || $mode == 'EX_MON') {
+ $sql .= ' AND DATE_FORMAT(d.date, \'%Y-%m\') = \''.dol_print_date($this->date, '%Y-%m').'\''; // @todo DATE_FORMAT is forbidden
+ } elseif ($mode == 'year' || $mode == 'EX_YEA') {
+ $sql .= ' AND DATE_FORMAT(d.date, \'%Y\') = \''.dol_print_date($this->date, '%Y').'\''; // @todo DATE_FORMAT is forbidden
+ }
dol_syslog('ExpenseReportLine::getExpAmount');
$resql = $this->db->query($sql);
- if ($resql)
- {
+ if ($resql) {
$num = $this->db->num_rows($resql);
- if ($num > 0)
- {
+ if ($num > 0) {
$obj = $this->db->fetch_object($resql);
$amount = (double) $obj->total_amount;
}
@@ -2816,7 +2802,9 @@ class ExpenseReportLine
$this->comments = trim($this->comments);
$this->vatrate = price2num($this->vatrate);
$this->value_unit = price2num($this->value_unit);
- if (empty($this->fk_c_exp_tax_cat)) $this->fk_c_exp_tax_cat = 0;
+ if (empty($this->fk_c_exp_tax_cat)) {
+ $this->fk_c_exp_tax_cat = 0;
+ }
$this->db->begin();
@@ -2834,24 +2822,27 @@ class ExpenseReportLine
$sql .= ",rule_warning_message='".$this->db->escape($this->rule_warning_message)."'";
$sql .= ",fk_c_exp_tax_cat=".$this->db->escape($this->fk_c_exp_tax_cat);
$sql .= ",fk_ecm_files=".($this->fk_ecm_files > 0 ? $this->fk_ecm_files : 'null');
- if ($this->fk_c_type_fees) $sql .= ",fk_c_type_fees=".$this->db->escape($this->fk_c_type_fees);
- else $sql .= ",fk_c_type_fees=null";
- if ($this->fk_project > 0) $sql .= ",fk_projet=".$this->db->escape($this->fk_project);
- else $sql .= ",fk_projet=null";
+ if ($this->fk_c_type_fees) {
+ $sql .= ",fk_c_type_fees=".$this->db->escape($this->fk_c_type_fees);
+ } else {
+ $sql .= ",fk_c_type_fees=null";
+ }
+ if ($this->fk_project > 0) {
+ $sql .= ",fk_projet=".$this->db->escape($this->fk_project);
+ } else {
+ $sql .= ",fk_projet=null";
+ }
$sql .= " WHERE rowid = ".$this->db->escape($this->rowid ? $this->rowid : $this->id);
dol_syslog("ExpenseReportLine::update sql=".$sql);
$resql = $this->db->query($sql);
- if ($resql)
- {
+ if ($resql) {
$tmpparent = new ExpenseReport($this->db);
$result = $tmpparent->fetch($this->fk_expensereport);
- if ($result > 0)
- {
+ if ($result > 0) {
$result = $tmpparent->update_price();
- if ($result < 0)
- {
+ if ($result < 0) {
$error++;
$this->error = $tmpparent->error;
$this->errors = $tmpparent->errors;
@@ -2866,8 +2857,7 @@ class ExpenseReportLine
dol_print_error($this->db);
}
- if (!$error)
- {
+ if (!$error) {
$this->db->commit();
return 1;
} else {
diff --git a/htdocs/expensereport/class/expensereport_ik.class.php b/htdocs/expensereport/class/expensereport_ik.class.php
index 55af1eb00ed..18a0503cdd7 100644
--- a/htdocs/expensereport/class/expensereport_ik.class.php
+++ b/htdocs/expensereport/class/expensereport_ik.class.php
@@ -111,15 +111,16 @@ class ExpenseReportIk extends CoreObject
$sql = 'SELECT rowid, label, entity, active';
$sql .= ' FROM '.MAIN_DB_PREFIX.'c_exp_tax_cat';
$sql .= ' WHERE entity IN ('.getEntity('c_exp_tax_cat').')';
- if ($mode == 1) $sql .= ' AND active = 1';
- elseif ($mode == 2) $sql .= 'AND active = 0';
+ if ($mode == 1) {
+ $sql .= ' AND active = 1';
+ } elseif ($mode == 2) {
+ $sql .= 'AND active = 0';
+ }
dol_syslog(get_called_class().'::getTaxCategories sql='.$sql, LOG_DEBUG);
$resql = $db->query($sql);
- if ($resql)
- {
- while ($obj = $db->fetch_object($resql))
- {
+ if ($resql) {
+ while ($obj = $db->fetch_object($resql)) {
$categories[$obj->rowid] = $obj;
}
} else {
@@ -142,8 +143,11 @@ class ExpenseReportIk extends CoreObject
$ranges = self::getRangesByCategory($fk_c_exp_tax_cat);
// substract 1 because array start from 0
- if (empty($ranges) || !isset($ranges[$default_range - 1])) return false;
- else return $ranges[$default_range - 1];
+ if (empty($ranges) || !isset($ranges[$default_range - 1])) {
+ return false;
+ } else {
+ return $ranges[$default_range - 1];
+ }
}
/**
@@ -160,20 +164,21 @@ class ExpenseReportIk extends CoreObject
$ranges = array();
$sql = 'SELECT r.rowid FROM '.MAIN_DB_PREFIX.'c_exp_tax_range r';
- if ($active) $sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'c_exp_tax_cat c ON (r.fk_c_exp_tax_cat = c.rowid)';
+ if ($active) {
+ $sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'c_exp_tax_cat c ON (r.fk_c_exp_tax_cat = c.rowid)';
+ }
$sql .= ' WHERE r.fk_c_exp_tax_cat = '.$fk_c_exp_tax_cat;
- if ($active) $sql .= ' AND r.active = 1 AND c.active = 1';
+ if ($active) {
+ $sql .= ' AND r.active = 1 AND c.active = 1';
+ }
$sql .= ' ORDER BY r.range_ik';
dol_syslog(get_called_class().'::getRangesByCategory sql='.$sql, LOG_DEBUG);
$resql = $db->query($sql);
- if ($resql)
- {
+ if ($resql) {
$num = $db->num_rows($resql);
- if ($num > 0)
- {
- while ($obj = $db->fetch_object($resql))
- {
+ if ($num > 0) {
+ while ($obj = $db->fetch_object($resql)) {
$object = new ExpenseReportIk($db);
$object->fetch($obj->rowid);
@@ -207,15 +212,17 @@ class ExpenseReportIk extends CoreObject
dol_syslog(get_called_class().'::getAllRanges sql='.$sql, LOG_DEBUG);
$resql = $db->query($sql);
- if ($resql)
- {
- while ($obj = $db->fetch_object($resql))
- {
+ if ($resql) {
+ while ($obj = $db->fetch_object($resql)) {
$ik = new ExpenseReportIk($db);
- if ($obj->fk_expense_ik > 0) $ik->fetch($obj->fk_expense_ik);
+ if ($obj->fk_expense_ik > 0) {
+ $ik->fetch($obj->fk_expense_ik);
+ }
$obj->ik = $ik;
- if (!isset($ranges[$obj->fk_c_exp_tax_cat])) $ranges[$obj->fk_c_exp_tax_cat] = array('label' => $obj->label, 'active' => $obj->cat_active, 'ranges' => array());
+ if (!isset($ranges[$obj->fk_c_exp_tax_cat])) {
+ $ranges[$obj->fk_c_exp_tax_cat] = array('label' => $obj->label, 'active' => $obj->cat_active, 'ranges' => array());
+ }
$ranges[$obj->fk_c_exp_tax_cat]['ranges'][] = $obj;
}
} else {
@@ -239,14 +246,15 @@ class ExpenseReportIk extends CoreObject
$sql .= ' SELECT COUNT(*) as counted';
$sql .= ' FROM '.MAIN_DB_PREFIX.'c_exp_tax_range r';
$sql .= ' WHERE r.entity IN (0, '.$conf->entity.')';
- if ($default_c_exp_tax_cat > 0) $sql .= ' AND r.fk_c_exp_tax_cat = '.$default_c_exp_tax_cat;
+ if ($default_c_exp_tax_cat > 0) {
+ $sql .= ' AND r.fk_c_exp_tax_cat = '.$default_c_exp_tax_cat;
+ }
$sql .= ' GROUP BY r.fk_c_exp_tax_cat';
$sql .= ') as counts';
dol_syslog(get_called_class().'::getMaxRangeNumber sql='.$sql, LOG_DEBUG);
$resql = $db->query($sql);
- if ($resql)
- {
+ if ($resql) {
$obj = $db->fetch_object($resql);
return $obj->nbRange;
} else {
diff --git a/htdocs/expensereport/class/expensereport_rule.class.php b/htdocs/expensereport/class/expensereport_rule.class.php
index 9a172cd7563..4e4d1009750 100644
--- a/htdocs/expensereport/class/expensereport_rule.class.php
+++ b/htdocs/expensereport/class/expensereport_rule.class.php
@@ -156,18 +156,15 @@ class ExpenseReportRule extends CoreObject
$sql = 'SELECT er.rowid';
$sql .= ' FROM '.MAIN_DB_PREFIX.'expensereport_rules er';
$sql .= ' WHERE er.entity IN (0,'.getEntity('').')';
- if (!empty($fk_c_type_fees))
- {
+ if (!empty($fk_c_type_fees)) {
$sql .= ' AND er.fk_c_type_fees IN (-1, '.$fk_c_type_fees.')';
}
- if (!empty($date))
- {
+ if (!empty($date)) {
$date = dol_print_date($date, '%Y-%m-%d');
$sql .= ' AND er.dates <= \''.$date.'\'';
$sql .= ' AND er.datee >= \''.$date.'\'';
}
- if ($fk_user > 0)
- {
+ if ($fk_user > 0) {
$sql .= ' AND (er.is_for_all = 1';
$sql .= ' OR er.fk_user = '.$fk_user;
$sql .= ' OR er.fk_usergroup IN (SELECT ugu.fk_usergroup FROM '.MAIN_DB_PREFIX.'usergroup_user ugu WHERE ugu.fk_user = '.$fk_user.') )';
@@ -177,13 +174,14 @@ class ExpenseReportRule extends CoreObject
dol_syslog("ExpenseReportRule::getAllRule sql=".$sql);
$resql = $db->query($sql);
- if ($resql)
- {
- while ($obj = $db->fetch_object($resql))
- {
+ if ($resql) {
+ while ($obj = $db->fetch_object($resql)) {
$rule = new ExpenseReportRule($db);
- if ($rule->fetch($obj->rowid) > 0) $rules[$rule->id] = $rule;
- else dol_print_error($db);
+ if ($rule->fetch($obj->rowid) > 0) {
+ $rules[$rule->id] = $rule;
+ } else {
+ dol_print_error($db);
+ }
}
} else {
dol_print_error($db);
@@ -201,11 +199,9 @@ class ExpenseReportRule extends CoreObject
{
include_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
- if ($this->fk_usergroup > 0)
- {
+ if ($this->fk_usergroup > 0) {
$group = new UserGroup($this->db);
- if ($group->fetch($this->fk_usergroup) > 0)
- {
+ if ($group->fetch($this->fk_usergroup) > 0) {
return $group->nom;
} else {
$this->error = $group->error;
@@ -225,11 +221,9 @@ class ExpenseReportRule extends CoreObject
{
include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
- if ($this->fk_user > 0)
- {
+ if ($this->fk_user > 0) {
$u = new User($this->db);
- if ($u->fetch($this->fk_user) > 0)
- {
+ if ($u->fetch($this->fk_user) > 0) {
return dolGetFirstLastname($u->firstname, $u->lastname);
} else {
$this->error = $u->error;
diff --git a/htdocs/expensereport/class/expensereportstats.class.php b/htdocs/expensereport/class/expensereportstats.class.php
index c4167e3002f..3d627cbce8d 100644
--- a/htdocs/expensereport/class/expensereportstats.class.php
+++ b/htdocs/expensereport/class/expensereportstats.class.php
@@ -70,20 +70,20 @@ class ExpenseReportStats extends Stats
$this->where .= ' e.entity IN ('.getEntity('expensereport').')';
//$this->where.= " AND entity = ".$conf->entity;
- if ($this->socid)
- {
+ if ($this->socid) {
$this->where .= " AND e.fk_soc = ".$this->socid;
}
// Only me and subordinates
- if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous))
- {
+ if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)) {
$childids = $user->getAllChildIds();
$childids[] = $user->id;
$this->where .= " AND e.fk_user_author IN (".(join(',', $childids)).")";
}
- if ($this->userid > 0) $this->where .= ' AND e.fk_user_author = '.$this->userid;
+ if ($this->userid > 0) {
+ $this->where .= ' AND e.fk_user_author = '.$this->userid;
+ }
}
diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php
index be8693f223e..56525e7b99c 100644
--- a/htdocs/expensereport/class/paymentexpensereport.class.php
+++ b/htdocs/expensereport/class/paymentexpensereport.class.php
@@ -119,19 +119,36 @@ class PaymentExpenseReport extends CommonObject
}
// Clean parameters
- if (isset($this->fk_expensereport)) $this->fk_expensereport = trim($this->fk_expensereport);
- if (isset($this->amount)) $this->amount = trim($this->amount);
- if (isset($this->fk_typepayment)) $this->fk_typepayment = trim($this->fk_typepayment);
- if (isset($this->num_payment)) $this->num_payment = trim($this->num_payment);
- if (isset($this->note)) $this->note = trim($this->note);
- if (isset($this->note_public)) $this->note_public = trim($this->note_public);
- if (isset($this->fk_bank)) $this->fk_bank = trim($this->fk_bank);
- if (isset($this->fk_user_creat)) $this->fk_user_creat = trim($this->fk_user_creat);
- if (isset($this->fk_user_modif)) $this->fk_user_modif = trim($this->fk_user_modif);
+ if (isset($this->fk_expensereport)) {
+ $this->fk_expensereport = trim($this->fk_expensereport);
+ }
+ if (isset($this->amount)) {
+ $this->amount = trim($this->amount);
+ }
+ if (isset($this->fk_typepayment)) {
+ $this->fk_typepayment = trim($this->fk_typepayment);
+ }
+ if (isset($this->num_payment)) {
+ $this->num_payment = trim($this->num_payment);
+ }
+ if (isset($this->note)) {
+ $this->note = trim($this->note);
+ }
+ if (isset($this->note_public)) {
+ $this->note_public = trim($this->note_public);
+ }
+ if (isset($this->fk_bank)) {
+ $this->fk_bank = trim($this->fk_bank);
+ }
+ if (isset($this->fk_user_creat)) {
+ $this->fk_user_creat = trim($this->fk_user_creat);
+ }
+ if (isset($this->fk_user_modif)) {
+ $this->fk_user_modif = trim($this->fk_user_modif);
+ }
$totalamount = 0;
- foreach ($this->amounts as $key => $value) // How payment is dispatch
- {
+ foreach ($this->amounts as $key => $value) { // How payment is dispatch
$newvalue = price2num($value, 'MT');
$this->amounts[$key] = $newvalue;
$totalamount += $newvalue;
@@ -139,13 +156,14 @@ class PaymentExpenseReport extends CommonObject
$totalamount = price2num($totalamount);
// Check parameters
- if ($totalamount == 0) return -1; // On accepte les montants negatifs pour les rejets de prelevement mais pas null
+ if ($totalamount == 0) {
+ return -1; // On accepte les montants negatifs pour les rejets de prelevement mais pas null
+ }
$this->db->begin();
- if ($totalamount != 0)
- {
+ if ($totalamount != 0) {
$sql = "INSERT INTO ".MAIN_DB_PREFIX."payment_expensereport (fk_expensereport, datec, datep, amount,";
$sql .= " fk_typepayment, num_payment, note, fk_user_creat, fk_bank)";
$sql .= " VALUES ($this->fk_expensereport, '".$this->db->idate($now)."',";
@@ -156,16 +174,14 @@ class PaymentExpenseReport extends CommonObject
dol_syslog(get_class($this)."::create", LOG_DEBUG);
$resql = $this->db->query($sql);
- if ($resql)
- {
+ if ($resql) {
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."payment_expensereport");
} else {
$error++;
}
}
- if ($totalamount != 0 && !$error)
- {
+ if ($totalamount != 0 && !$error) {
$this->amount = $totalamount;
$this->db->commit();
return $this->id;
@@ -206,10 +222,8 @@ class PaymentExpenseReport extends CommonObject
dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
$resql = $this->db->query($sql);
- if ($resql)
- {
- if ($this->db->num_rows($resql))
- {
+ if ($resql) {
+ if ($this->db->num_rows($resql)) {
$obj = $this->db->fetch_object($resql);
$this->id = $obj->rowid;
@@ -258,14 +272,30 @@ class PaymentExpenseReport extends CommonObject
// Clean parameters
- if (isset($this->fk_expensereport)) $this->fk_expensereport = trim($this->fk_expensereport);
- if (isset($this->amount)) $this->amount = trim($this->amount);
- if (isset($this->fk_typepayment)) $this->fk_typepayment = trim($this->fk_typepayment);
- if (isset($this->num_payment)) $this->num_payment = trim($this->num_payment);
- if (isset($this->note)) $this->note = trim($this->note);
- if (isset($this->fk_bank)) $this->fk_bank = trim($this->fk_bank);
- if (isset($this->fk_user_creat)) $this->fk_user_creat = trim($this->fk_user_creat);
- if (isset($this->fk_user_modif)) $this->fk_user_modif = trim($this->fk_user_modif);
+ if (isset($this->fk_expensereport)) {
+ $this->fk_expensereport = trim($this->fk_expensereport);
+ }
+ if (isset($this->amount)) {
+ $this->amount = trim($this->amount);
+ }
+ if (isset($this->fk_typepayment)) {
+ $this->fk_typepayment = trim($this->fk_typepayment);
+ }
+ if (isset($this->num_payment)) {
+ $this->num_payment = trim($this->num_payment);
+ }
+ if (isset($this->note)) {
+ $this->note = trim($this->note);
+ }
+ if (isset($this->fk_bank)) {
+ $this->fk_bank = trim($this->fk_bank);
+ }
+ if (isset($this->fk_user_creat)) {
+ $this->fk_user_creat = trim($this->fk_user_creat);
+ }
+ if (isset($this->fk_user_modif)) {
+ $this->fk_user_modif = trim($this->fk_user_modif);
+ }
// Check parameters
@@ -293,13 +323,13 @@ class PaymentExpenseReport extends CommonObject
dol_syslog(get_class($this)."::update", LOG_DEBUG);
$resql = $this->db->query($sql);
- if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+ if (!$resql) {
+ $error++; $this->errors[] = "Error ".$this->db->lasterror();
+ }
// Commit or rollback
- if ($error)
- {
- foreach ($this->errors as $errmsg)
- {
+ if ($error) {
+ foreach ($this->errors as $errmsg) {
dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
}
@@ -327,18 +357,18 @@ class PaymentExpenseReport extends CommonObject
$this->db->begin();
- if (!$error)
- {
+ if (!$error) {
$sql = "DELETE FROM ".MAIN_DB_PREFIX."bank_url";
$sql .= " WHERE type='payment_expensereport' AND url_id=".$this->id;
dol_syslog(get_class($this)."::delete", LOG_DEBUG);
$resql = $this->db->query($sql);
- if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
+ if (!$resql) {
+ $error++; $this->errors[] = "Error ".$this->db->lasterror();
+ }
}
- if (!$error)
- {
+ if (!$error) {
$sql = "DELETE FROM ".MAIN_DB_PREFIX."payment_expensereport";
$sql .= " WHERE rowid=".$this->id;
@@ -351,10 +381,8 @@ class PaymentExpenseReport extends CommonObject
}
// Commit or rollback
- if ($error)
- {
- foreach ($this->errors as $errmsg)
- {
+ if ($error) {
+ foreach ($this->errors as $errmsg) {
dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
}
@@ -396,8 +424,7 @@ class PaymentExpenseReport extends CommonObject
$result = $object->create($user);
// Other options
- if ($result < 0)
- {
+ if ($result < 0) {
$this->error = $object->error;
$error++;
}
@@ -405,8 +432,7 @@ class PaymentExpenseReport extends CommonObject
unset($object->context['createfromclone']);
// End
- if (!$error)
- {
+ if (!$error) {
$this->db->commit();
return $object->id;
} else {
@@ -487,8 +513,7 @@ class PaymentExpenseReport extends CommonObject
$error = 0;
- if (!empty($conf->banque->enabled))
- {
+ if (!empty($conf->banque->enabled)) {
include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
$acc = new Account($this->db);
@@ -497,7 +522,9 @@ class PaymentExpenseReport extends CommonObject
//Fix me field
$total = $this->amount;
- if ($mode == 'payment_expensereport') $amount = $total;
+ if ($mode == 'payment_expensereport') {
+ $amount = $total;
+ }
// Insert payment into llx_bank
$bank_line_id = $acc->addline(
@@ -514,35 +541,30 @@ class PaymentExpenseReport extends CommonObject
// Update fk_bank in llx_paiement.
// On connait ainsi le paiement qui a genere l'ecriture bancaire
- if ($bank_line_id > 0)
- {
+ if ($bank_line_id > 0) {
$result = $this->update_fk_bank($bank_line_id);
- if ($result <= 0)
- {
+ if ($result <= 0) {
$error++;
dol_print_error($this->db);
}
// Add link 'payment', 'payment_supplier', 'payment_expensereport' in bank_url between payment and bank transaction
$url = '';
- if ($mode == 'payment_expensereport') $url = DOL_URL_ROOT.'/expensereport/payment/card.php?rowid=';
- if ($url)
- {
+ if ($mode == 'payment_expensereport') {
+ $url = DOL_URL_ROOT.'/expensereport/payment/card.php?rowid=';
+ }
+ if ($url) {
$result = $acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode);
- if ($result <= 0)
- {
+ if ($result <= 0) {
$error++;
dol_print_error($this->db);
}
}
// Add link 'user' in bank_url between user and bank transaction
- if (!$error)
- {
- foreach ($this->amounts as $key => $value) // We should have always same user but we loop in case of.
- {
- if ($mode == 'payment_expensereport')
- {
+ if (!$error) {
+ foreach ($this->amounts as $key => $value) { // We should have always same user but we loop in case of.
+ if ($mode == 'payment_expensereport') {
$fuser = new User($this->db);
$fuser->fetch($key);
@@ -553,8 +575,7 @@ class PaymentExpenseReport extends CommonObject
$fuser->getFullName($langs),
'user'
);
- if ($result <= 0)
- {
+ if ($result <= 0) {
$this->error = $this->db->lasterror();
dol_syslog(get_class($this).'::addPaymentToBank '.$this->error);
$error++;
@@ -568,8 +589,7 @@ class PaymentExpenseReport extends CommonObject
}
}
- if (!$error)
- {
+ if (!$error) {
return 1;
} else {
return -1;
@@ -591,8 +611,7 @@ class PaymentExpenseReport extends CommonObject
dol_syslog(get_class($this)."::update_fk_bank", LOG_DEBUG);
$result = $this->db->query($sql);
- if ($result)
- {
+ if ($result) {
return 1;
} else {
$this->error = $this->db->error();
@@ -613,17 +632,24 @@ class PaymentExpenseReport extends CommonObject
$result = '';
- if (empty($this->ref)) $this->ref = $this->label;
+ if (empty($this->ref)) {
+ $this->ref = $this->label;
+ }
$label = $langs->trans("ShowPayment").': '.$this->ref;
- if (!empty($this->id))
- {
+ if (!empty($this->id)) {
$link = '
';
$linkend = '';
- if ($withpicto) $result .= ($link.img_object($label, 'payment', 'class="classfortooltip"').$linkend.' ');
- if ($withpicto && $withpicto != 2) $result .= ' ';
- if ($withpicto != 2) $result .= $link.($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref).$linkend;
+ if ($withpicto) {
+ $result .= ($link.img_object($label, 'payment', 'class="classfortooltip"').$linkend.' ');
+ }
+ if ($withpicto && $withpicto != 2) {
+ $result .= ' ';
+ }
+ if ($withpicto != 2) {
+ $result .= $link.($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref).$linkend;
+ }
}
return $result;
@@ -644,20 +670,16 @@ class PaymentExpenseReport extends CommonObject
dol_syslog(get_class($this).'::info', LOG_DEBUG);
$result = $this->db->query($sql);
- if ($result)
- {
- if ($this->db->num_rows($result))
- {
+ if ($result) {
+ if ($this->db->num_rows($result)) {
$obj = $this->db->fetch_object($result);
$this->id = $obj->rowid;
- if ($obj->fk_user_creat)
- {
+ if ($obj->fk_user_creat) {
$cuser = new User($this->db);
$cuser->fetch($obj->fk_user_creat);
$this->user_creation = $cuser;
}
- if ($obj->fk_user_modif)
- {
+ if ($obj->fk_user_modif) {
$muser = new User($this->db);
$muser->fetch($obj->fk_user_modif);
$this->user_modification = $muser;
diff --git a/htdocs/expensereport/document.php b/htdocs/expensereport/document.php
index 55799b10589..7713745a0a3 100644
--- a/htdocs/expensereport/document.php
+++ b/htdocs/expensereport/document.php
@@ -45,7 +45,9 @@ $confirm = GETPOST('confirm', 'alpha');
$childids = $user->getAllChildIds(1);
// Security check
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+ $socid = $user->socid;
+}
$result = restrictedArea($user, 'expensereport', $id, 'expensereport');
@@ -54,17 +56,22 @@ $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
$sortfield = GETPOST('sortfield', 'aZ09comma');
$sortorder = GETPOST('sortorder', 'aZ09comma');
$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+ $page = 0;
+} // If $page is not defined, or '' or -1
$offset = $limit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
-if (!$sortorder) $sortorder = "ASC";
-if (!$sortfield) $sortfield = "position_name";
+if (!$sortorder) {
+ $sortorder = "ASC";
+}
+if (!$sortfield) {
+ $sortfield = "position_name";
+}
$object = new ExpenseReport($db);
-if (!$object->fetch($id, $ref) > 0)
-{
+if (!$object->fetch($id, $ref) > 0) {
dol_print_error($db);
}
@@ -74,14 +81,16 @@ $modulepart = 'trip';
// Load object
//include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
-if ($object->id > 0)
-{
+if ($object->id > 0) {
// Check current user can read this expense report
$canread = 0;
- if (!empty($user->rights->expensereport->readall)) $canread = 1;
- if (!empty($user->rights->expensereport->lire) && in_array($object->fk_user_author, $childids)) $canread = 1;
- if (!$canread)
- {
+ if (!empty($user->rights->expensereport->readall)) {
+ $canread = 1;
+ }
+ if (!empty($user->rights->expensereport->lire) && in_array($object->fk_user_author, $childids)) {
+ $canread = 1;
+ }
+ if (!$canread) {
accessforbidden();
}
}
@@ -104,8 +113,7 @@ $title = $langs->trans("ExpenseReport")." - ".$langs->trans("Documents");
$helpurl = "EN:Module_Expense_Reports";
llxHeader("", $title, $helpurl);
-if ($object->id)
-{
+if ($object->id) {
$object->fetch_thirdparty();
$head = expensereport_prepare_head($object);
@@ -124,8 +132,7 @@ if ($object->id)
// Build file list
$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
$totalsize = 0;
- foreach ($filearray as $key => $file)
- {
+ foreach ($filearray as $key => $file) {
$totalsize += $file['size'];
}
diff --git a/htdocs/expensereport/index.php b/htdocs/expensereport/index.php
index 046bde4efa1..541c2c0738e 100644
--- a/htdocs/expensereport/index.php
+++ b/htdocs/expensereport/index.php
@@ -42,19 +42,27 @@ $langs->loadLangs(array('companies', 'users', 'trips'));
// Security check
$socid = GETPOST('socid', 'int');
-if ($user->socid) $socid = $user->socid;
+if ($user->socid) {
+ $socid = $user->socid;
+}
$result = restrictedArea($user, 'expensereport', '', '');
$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
$sortfield = GETPOST("sortfield", 'alpha');
$sortorder = GETPOST("sortorder", 'alpha');
$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) { $page = 0; } // If $page is not defined, or '' or -1
+if (empty($page) || $page == -1) {
+ $page = 0;
+} // If $page is not defined, or '' or -1
$offset = $limit * $page;
$pageprev = $page - 1;
$pagenext = $page + 1;
-if (!$sortorder) $sortorder = "DESC";
-if (!$sortfield) $sortfield = "d.date_create";
+if (!$sortorder) {
+ $sortorder = "DESC";
+}
+if (!$sortfield) {
+ $sortfield = "d.date_create";
+}
$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
@@ -80,8 +88,7 @@ $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as d, ".MAIN_DB_PREFIX."expensere
$sql .= " WHERE de.fk_expensereport = d.rowid AND d.entity IN (".getEntity('expensereport').") AND de.fk_c_type_fees = tf.id";
// RESTRICT RIGHTS
if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)
- && (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance)))
-{
+ && (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance))) {
$childids = $user->getAllChildIds();
$childids[] = $user->id;
$sql .= " AND d.fk_user_author IN (".join(',', $childids).")\n";
@@ -90,12 +97,10 @@ if (empty($user->rights->expensereport->readall) && empty($user->rights->expense
$sql .= " GROUP BY tf.code, tf.label";
$result = $db->query($sql);
-if ($result)
-{
+if ($result) {
$num = $db->num_rows($result);
$i = 0;
- while ($i < $num)
- {
+ while ($i < $num) {
$objp = $db->fetch_object($result);
$somme[$objp->code] = $objp->km;
@@ -123,13 +128,11 @@ print '
'.$langs->trans("Statistics").' | ';
print "\n";
$listoftype = $tripandexpense_static->listOfTypes();
-foreach ($listoftype as $code => $label)
-{
+foreach ($listoftype as $code => $label) {
$dataseries[] = array($label, (isset($somme[$code]) ? (int) $somme[$code] : 0));
}
-if ($conf->use_javascript_ajax)
-{
+if ($conf->use_javascript_ajax) {
print '
| ';
include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
@@ -168,25 +171,29 @@ $langs->load("boxes");
$sql = "SELECT u.rowid as uid, u.lastname, u.firstname, u.login, u.statut as user_status, u.photo, u.email, u.admin,";
$sql .= " d.rowid, d.ref, d.date_debut as dated, d.date_fin as datef, d.date_create as dm, d.total_ht, d.total_ttc, d.fk_statut as status";
$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as d, ".MAIN_DB_PREFIX."user as u";
-if (!$user->rights->societe->client->voir && !$user->socid) $sql .= ", ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (!$user->rights->societe->client->voir && !$user->socid) {
+ $sql .= ", ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
$sql .= " WHERE u.rowid = d.fk_user_author";
// RESTRICT RIGHTS
if (empty($user->rights->expensereport->readall) && empty($user->rights->expensereport->lire_tous)
- && (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance)))
-{
+ && (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance))) {
$childids = $user->getAllChildIds();
$childids[] = $user->id;
$sql .= " AND d.fk_user_author IN (".join(',', $childids).")\n";
}
$sql .= ' AND d.entity IN ('.getEntity('expensereport').')';
-if (!$user->rights->societe->client->voir && !$user->socid) $sql .= " AND d.fk_user_author = s.rowid AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
-if ($socid) $sql .= " AND d.fk_user_author = ".$socid;
+if (!$user->rights->societe->client->voir && !$user->socid) {
+ $sql .= " AND d.fk_user_author = s.rowid AND s.rowid = sc.fk_soc AND sc.fk_user = ".$user->id;
+}
+if ($socid) {
+ $sql .= " AND d.fk_user_author = ".$socid;
+}
$sql .= $db->order($sortfield, $sortorder);
$sql .= $db->plimit($max, 0);
$result = $db->query($sql);
-if ($result)
-{
+if ($result) {
$var = false;
$num = $db->num_rows($result);
@@ -201,14 +208,12 @@ if ($result)
print ' | '.$langs->trans("DateModificationShort").' | ';
print ' | ';
print '
|---|
';
- if ($num)
- {
+ if ($num) {
$total_ttc = $totalam = $total = 0;
$expensereportstatic = new ExpenseReport($db);
$userstatic = new User($db);
- while ($i < $num && $i < $max)
- {
+ while ($i < $num && $i < $max) {
$obj = $db->fetch_object($result);
$expensereportstatic->id = $obj->rowid;
@@ -241,7 +246,9 @@ if ($result)
print '
| '.$langs->trans("None").' |
';
}
print '