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

clean code

Browse Source
This commit is contained in:
Frédéric FRANCE 2023-02-08 21:30:55 +01:00
parent 019802ec33
commit 3f8aaf5cbc
1 changed files with 50 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@
* Copyright (C) 2015 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2015 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2015 Alexandre Spangaro <aspangaro@open-dsi.fr> * Copyright (C) 2015 Alexandre Spangaro <aspangaro@open-dsi.fr>
* Copyright (C) 2018 Nicolas ZABOURI <info@inovea-conseil.com> * Copyright (C) 2018 Nicolas ZABOURI <info@inovea-conseil.com>
* Copyright (c) 2018-2021 Frédéric France <frederic.france@netlogic.fr> * Copyright (c) 2018-2023 Frédéric France <frederic.france@netlogic.fr>
* Copyright (C) 2016-2020 Ferran Marcet <fmarcet@2byte.es> * Copyright (C) 2016-2020 Ferran Marcet <fmarcet@2byte.es>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -60,8 +60,16 @@ class ExpenseReport extends CommonObject
*/ */
public $picto = 'trip'; public $picto = 'trip';
/**
* @var ExpenseReportLine[] array of expensereport lines
*/
public $lines = array(); public $lines = array();
/**
* @var ExpenseReportLine expensereport lines
*/
public $line;
public $date_debut; public $date_debut;
public $date_fin; public $date_fin;
@ -93,6 +101,15 @@ class ExpenseReport extends CommonObject
// Create // Create
public $date_create; public $date_create;
/**
* @var int ID of user creator
*/
public $fk_user_creat;
/**
* @var int ID of user who reclaim expense report
*/
public $fk_user_author; // Note fk_user_author is not the 'author' but the guy the expense report is for. public $fk_user_author; // Note fk_user_author is not the 'author' but the guy the expense report is for.
// Update // Update
@ -107,15 +124,34 @@ class ExpenseReport extends CommonObject
// Annulation // Annulation
public $date_cancel; public $date_cancel;
public $detail_cancel; public $detail_cancel;
/**
* @var int ID of user who cancel expense report
*/
public $fk_user_cancel; public $fk_user_cancel;
public $fk_user_validator; // User that is defined to approve /**
* @var int User that is defined to approve
*/
public $fk_user_validator;
// Validation /**
/* @deprecated */ * Validation date
* @var int
* @deprecated
* @see $date_valid
*/
public $datevalid; public $datevalid;
public $date_valid; // User making validation /**
* Validation date
* @var int
*/
public $date_valid;
/**
* @var int ID of User making validation
*/
public $fk_user_valid; public $fk_user_valid;
public $user_valid_infos; public $user_valid_infos;
@ -154,16 +190,15 @@ class ExpenseReport extends CommonObject
*/ */
const STATUS_APPROVED = 5; const STATUS_APPROVED = 5;
/**
* Classified refused
*/
const STATUS_REFUSED = 99;
/** /**
* Classified paid. * Classified paid.
*/ */
const STATUS_CLOSED = 6; const STATUS_CLOSED = 6;
/**
* Classified refused
*/
const STATUS_REFUSED = 99;
public $fields = array( public $fields = array(
'rowid' =>array('type'=>'integer', 'label'=>'ID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10), 'rowid' =>array('type'=>'integer', 'label'=>'ID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
@ -434,12 +469,12 @@ class ExpenseReport extends CommonObject
$this->fk_statut = 0; // deprecated $this->fk_statut = 0; // deprecated
// Clear fields // Clear fields
$this->fk_user_creat = $user->id; $this->fk_user_creat = $user->id;
$this->fk_user_author = $fk_user_author; // Note fk_user_author is not the 'author' but the guy the expense report is for. $this->fk_user_author = $fk_user_author; // Note fk_user_author is not the 'author' but the guy the expense report is for.
$this->fk_user_valid = ''; $this->fk_user_valid = '';
$this->date_create = ''; $this->date_create = '';
$this->date_creation = ''; $this->date_creation = '';
$this->date_validation = ''; $this->date_validation = '';
// Remove link on lines to a joined file // Remove link on lines to a joined file
if (is_array($this->lines) && count($this->lines) > 0) { if (is_array($this->lines) && count($this->lines) > 0) {