';
print '
';
@@ -276,24 +306,17 @@ if (empty($action) || $action=="view")
print '';
print '
| '.$langs->trans("Module").' | ';
- print $cashcontrol->posmodule;
+ print $object->posmodule;
print " |
";
print '
| '.$langs->trans("InitialBankBalance").' | ';
- print price($cashcontrol->opening);
+ print price($object->opening);
print " |
";
print '
| ';
- print $langs->trans("DateEnd");
+ print $langs->trans("Period");
print ' | ';
- print $cashcontrol->year_close."-".$cashcontrol->month_close."-".$cashcontrol->day_close;
- print ' |
';
-
- print '
| ';
- print $langs->trans("Status");
- print ' | ';
- if ($cashcontrol->status==1) print $langs->trans("Opened");
- if ($cashcontrol->status==2) print $langs->trans("Closed");
+ print $object->year_close."-".$object->month_close."-".$object->day_close;
print ' |
';
print '';
@@ -306,11 +329,11 @@ if (empty($action) || $action=="view")
print '
| ';
print $langs->trans("DateCreationShort");
print ' | ';
- print dol_print_date($cashcontrol->date_creation, 'dayhour');
+ print dol_print_date($object->date_creation, 'dayhour');
print ' |
';
print '
| '.$langs->trans("CashDesk").' ID | ';
- print $cashcontrol->posnumber;
+ print $object->posnumber;
print " |
";
print "\n";
@@ -322,7 +345,10 @@ if (empty($action) || $action=="view")
print '
';
print '
';
- if ($cashcontrol->status==1) print '
';
+ if ($object->status == CashControl::STATUS_DRAFT)
+ {
+ print '
';
+ }
print '
';
print '
';
diff --git a/htdocs/compta/cashcontrol/class/cashcontrol.class.php b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
index 37f73f6712f..fc83239ea70 100644
--- a/htdocs/compta/cashcontrol/class/cashcontrol.class.php
+++ b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
@@ -88,7 +88,7 @@ class CashControl extends CommonObject
public $card;
const STATUS_DRAFT = 0;
- const STATUS_VALIDATE = 1;
+ const STATUS_VALIDATED = 1;
/**
@@ -302,6 +302,70 @@ class CashControl extends CommonObject
}
}
+ /**
+ * Return label of the status
+ *
+ * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+ * @return string Label of status
+ */
+ public function getLibStatut($mode=0)
+ {
+ return $this->LibStatut($this->status, $mode);
+ }
+
+ // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+ /**
+ * Return the status
+ *
+ * @param int $status Id status
+ * @param int $mode 0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+ * @return string Label of status
+ */
+ public function LibStatut($status, $mode=0)
+ {
+ // phpcs:enable
+ if (empty($this->labelstatus))
+ {
+ global $langs;
+ //$langs->load("mymodule");
+ $this->labelstatus[0] = $langs->trans('Draft');
+ $this->labelstatus[1] = $langs->trans('Closed');
+ }
+
+ if ($mode == 0)
+ {
+ return $this->labelstatus[$status];
+ }
+ elseif ($mode == 1)
+ {
+ return $this->labelstatus[$status];
+ }
+ elseif ($mode == 2)
+ {
+ if ($status == 1) return img_picto($this->labelstatus[$status],'statut6', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelstatus[$status];
+ elseif ($status == 0) return img_picto($this->labelstatus[$status],'statut0', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelstatus[$status];
+ }
+ elseif ($mode == 3)
+ {
+ if ($status == 1) return img_picto($this->labelstatus[$status],'statut6', '', false, 0, 0, '', 'valignmiddle');
+ elseif ($status == 0) return img_picto($this->labelstatus[$status],'statut0', '', false, 0, 0, '', 'valignmiddle');
+ }
+ elseif ($mode == 4)
+ {
+ if ($status == 1) return img_picto($this->labelstatus[$status],'statut6', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelstatus[$status];
+ elseif ($status == 0) return img_picto($this->labelstatus[$status],'statut0', '', false, 0, 0, '', 'valignmiddle').' '.$this->labelstatus[$status];
+ }
+ elseif ($mode == 5)
+ {
+ if ($status == 1) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status],'statut6', '', false, 0, 0, '', 'valignmiddle');
+ elseif ($status == 0) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status],'statut0', '', false, 0, 0, '', 'valignmiddle');
+ }
+ elseif ($mode == 6)
+ {
+ if ($status == 1) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status],'statut6', '', false, 0, 0, '', 'valignmiddle');
+ elseif ($status == 0) return $this->labelstatus[$status].' '.img_picto($this->labelstatus[$status],'statut0', '', false, 0, 0, '', 'valignmiddle');
+ }
+ }
/**
* Return clicable link of object (with eventually picto)
diff --git a/htdocs/langs/en_US/blockedlog.lang b/htdocs/langs/en_US/blockedlog.lang
index 88d3662be9c..0dac5a6fd8c 100644
--- a/htdocs/langs/en_US/blockedlog.lang
+++ b/htdocs/langs/en_US/blockedlog.lang
@@ -8,8 +8,8 @@ BrowseBlockedLog=Unalterable logs
ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log is not valid. It means someone (a hacker?) has modified some data of this archived log after it was recorded, or has erased the previous archived record (check that line with previous # exists).
-OkCheckFingerprintValidity=Archived log is valid. It means all data on this line were not modified and record follow the previous one.
+KoCheckFingerprintValidity=Archived log record is not valid. It means someone (a hacker?) has modified some data of this archived log record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+OkCheckFingerprintValidity=Archived log record is valid. It means all data on this line were not modified and record follow the previous one.
OkCheckFingerprintValidityButChainIsKo=Archived log seems valid compared to previous one but the chain was corrupted previously.
AddedByAuthority=Stored into remote authority
NotAddedByAuthorityYet=Not yet stored into remote authority
@@ -35,6 +35,7 @@ logDON_DELETE=Donation logical deletion
logMEMBER_SUBSCRIPTION_CREATE=Member subscription created
logMEMBER_SUBSCRIPTION_MODIFY=Member subscription modified
logMEMBER_SUBSCRIPTION_DELETE=Member subscription logical deletion
+logCASHCONTROL_VALIDATE=Cash fence recording
BlockedLogBillDownload=Customer invoice download
BlockedLogBillPreview=Customer invoice preview
BlockedlogInfoDialog=Log Details