diff --git a/htdocs/compta/cashcontrol/cashcontrol_card.php b/htdocs/compta/cashcontrol/cashcontrol_card.php index 7466f50acf6..1b6d66cf9e6 100644 --- a/htdocs/compta/cashcontrol/cashcontrol_card.php +++ b/htdocs/compta/cashcontrol/cashcontrol_card.php @@ -119,6 +119,7 @@ $permissiontodelete = ($user->hasRight("cashdesk", "run") || $user->hasRight("ta /* * Actions */ + $error = 0; if (empty($backtopage)) { diff --git a/htdocs/compta/cashcontrol/report.php b/htdocs/compta/cashcontrol/report.php index 888b83f68bf..2be9352622a 100644 --- a/htdocs/compta/cashcontrol/report.php +++ b/htdocs/compta/cashcontrol/report.php @@ -58,7 +58,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'; * @var User $user */ -$langs->loadLangs(array("bills", "banks")); +$langs->loadLangs(array("bills", "banks", "cashdesk")); $id = GETPOSTINT('id'); $summaryonly = GETPOSTINT('summaryonly'); // May be used for ticket Z @@ -175,7 +175,7 @@ if ($resql) { $nameterminal = getDolGlobalString("TAKEPOS_TERMINAL_NAME_".$object->posnumber); print $langs->trans("CashControl")." #".$object->id.(($nameterminal != "TAKEPOS_TERMINAL_NAME_".$object->posnumber) ? '
'.$nameterminal : ''); if ($object->status == $object::STATUS_DRAFT) { - print '
('.$langs->trans("Draft").")"; + print '
('.$langs->trans("Draft")." - ".$langs->trans("TheoricalView").")"; } print ""; print $mysoc->name; diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang index 385213ad672..0925c69f2a1 100644 --- a/htdocs/langs/en_US/cashdesk.lang +++ b/htdocs/langs/en_US/cashdesk.lang @@ -178,3 +178,4 @@ CashRegisterAlertFR2=Every cash control is recorded into the Unalterable Log. KitchenPrinter=Kitchen printer CashControlEndDateMustBeBeforeNow=It is not possible to make a monthly or yearly cash control when the period is not yet complete. Select a past period or add a day in the selection. CashControlEndDayMustNotBeInPast=It is not possible to make a daily cash control on a day in the future. +TheoricalView=Theorical view