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

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

Browse Source
This commit is contained in:
Laurent Destailleur 2022-08-31 17:23:03 +02:00
commit 4d46da9514
2 changed files with 4 additions and 4 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
/**
* @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;
/**
* @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 = '';
/**
* @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;

2
htdocs/reception/card.php
View File

@ -1454,7 +1454,7 @@ if ($action == 'create') {
// Date creation
print '<tr><td class="titlefield">'.$langs->trans("DateCreation").'</td>';
print '<td colspan="3">'.dol_print_date($object->date_creation, "dayhour")."</td>\n";
print '<td colspan="3">'.dol_print_date($object->date_creation, "dayhour", "tzuserrel")."</td>\n";
print '</tr>';
// Delivery date planned