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

Doc

Browse Source
This commit is contained in:
Laurent Destailleur 2022-08-28 23:32:36 +02:00
parent ee651c5d8d
commit ec5af6cd23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/holiday/class/holiday.class.php
View File

@ -85,17 +85,17 @@ class Holiday extends CommonObject
public $statut = ''; // 1=draft, 2=validated, 3=approved public $statut = ''; // 1=draft, 2=validated, 3=approved
/** /**
* @var int ID of user that must approve. TODO: there is no date for validation (date_valid is used for approval), add one. * @var int ID of user that must approve. Real user for approval is fk_user_valid (old version) or fk_user_approve (new versions)
*/ */
public $fk_validator; public $fk_validator;
/** /**
* @var int Date of approval. TODO: Add a field for approval date and use date_valid instead for validation. * @var int Date of validation or approval. TODO: Use date_valid instead for validation.
*/ */
public $date_valid = ''; public $date_valid = '';
/** /**
* @var int ID of user that has approved (empty if not approved) * @var int ID of user that has validated or approved (empty if not approved)
*/ */
public $fk_user_valid; public $fk_user_valid;

4
htdocs/install/mysql/tables/llx_holiday.sql
View File

@ -33,8 +33,8 @@ date_fin DATE NOT NULL,
halfday integer DEFAULT 0, -- 0=start morning and end afternoon, -1=start afternoon end afternoon, 1=start morning and end morning, 2=start afternoon and end morning halfday integer DEFAULT 0, -- 0=start morning and end afternoon, -1=start afternoon end afternoon, 1=start morning and end morning, 2=start afternoon and end morning
statut integer NOT NULL DEFAULT '1', statut integer NOT NULL DEFAULT '1',
fk_validator integer NOT NULL, -- who should approve fk_validator integer NOT NULL, -- who should approve
date_valid DATETIME DEFAULT NULL, -- date approval (both date valid and date_approval) date_valid DATETIME DEFAULT NULL, -- date validation or approval (both date valid and date_approval)
fk_user_valid integer DEFAULT NULL, -- user approval (both user valid and user that approved) fk_user_valid integer DEFAULT NULL, -- user validation or approval (both user valid and user that approved)
date_approve DATETIME DEFAULT NULL, -- date approval (not used yet) date_approve DATETIME DEFAULT NULL, -- date approval (not used yet)
fk_user_approve integer DEFAULT NULL, -- user approval (not used yet) fk_user_approve integer DEFAULT NULL, -- user approval (not used yet)
date_refuse DATETIME DEFAULT NULL, date_refuse DATETIME DEFAULT NULL,