diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php index 8b522b93ec1..26be8d2c726 100644 --- a/htdocs/holiday/class/holiday.class.php +++ b/htdocs/holiday/class/holiday.class.php @@ -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; diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php index ed4586a7376..97d56d56e09 100644 --- a/htdocs/reception/card.php +++ b/htdocs/reception/card.php @@ -1454,7 +1454,7 @@ if ($action == 'create') { // Date creation print ''.$langs->trans("DateCreation").''; - print ''.dol_print_date($object->date_creation, "dayhour")."\n"; + print ''.dol_print_date($object->date_creation, "dayhour", "tzuserrel")."\n"; print ''; // Delivery date planned