Skip to content

#2324 [Control] fix: date calcul in confirm box #2329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
evarisk-charles wants to merge 1 commit into
base: develop
Choose a base branch
from
+3 −2
Open

#2324 [Control] fix: date calcul in confirm box #2329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion langs/fr_FR/digiquali.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,8 @@ DraftValidatedLocked = -- (Brouillon + validé + verro
CloneControlEquipments = Cloner les moyens de contrôle
NoControl = Aucun contrôle
NoPeriodicityControl = Aucune périodicité de contrôle
LockControlDate = Le verrouillage de ce contrôle en date du &emsp;&emsp;&emsp; : <b> %s </b> <br> entrainera une date de prochain contrôle pour le : <b> %s </b> <br> soit dans &emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp; : <b> %d jours. </b>
LockControlDate = Le verrouillage de ce contrôle en date du &emsp;&emsp;&emsp; : <b> %s </b> <br> entrainera une date de prochain contrôle pour le : <b> %s </b> <br> soit dans &emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp;&emsp; : <b> %s. </b>
AskNextControlDate = Veuillez indiquer la date du prochain contrôle pour pouvoir accéder à la durée avant le contrôle suivant.



Expand Down
2 changes: 1 addition & 1 deletion view/control/control_card.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,7 @@
$days = floor($days / (60 * 60 * 24));
}
if (($action == 'lock' && (empty($conf->use_javascript_ajax) || !empty($conf->dol_use_jmobile))) || (!empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))) {
$formConfirm .= $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('LockObject', $langs->transnoentities('The' . ucfirst($object->element))), $langs->trans('ConfirmLockObject', $langs->transnoentities('The' . ucfirst($object->element))) . ($object->verdict == 2 ? '<br>' . $langs->transnoentities('BeCarefullVerdictKO') : '' . '<br><br>' . $langs->transnoentities('LockControlDate', dol_print_date($object->control_date), $nextControlExist == 1 ? dol_print_date($object->next_control_date) : $langs->transnoentities('NA'), $days)), 'confirm_lock', '', 'yes', 'actionButtonLock', 350, 600);
$formConfirm .= $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('LockObject', $langs->transnoentities('The' . ucfirst($object->element))), $langs->trans('ConfirmLockObject', $langs->transnoentities('The' . ucfirst($object->element))) . ($object->verdict == 2 ? '<br>' . $langs->transnoentities('BeCarefullVerdictKO') : '' . '<br><br>' . $langs->transnoentities('LockControlDate', dol_print_date($object->control_date), $nextControlExist == 1 ? dol_print_date($object->next_control_date) : $langs->transnoentities('NA'), $nextControlExist == 1 ? $days . ' ' . $langs->trans('days') : $langs->transnoentities('AskNextControlDate'))), 'confirm_lock', '', 'yes', 'actionButtonLock', 350, 600);
}

// Clone confirmation
Expand Down