Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
16ac8a9d52
2 changed files with 3 additions and 1 deletions
|
|
@ -28,6 +28,7 @@
|
|||
*/
|
||||
|
||||
require '../../main.inc.php';
|
||||
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
|
||||
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
|
||||
require_once DOL_DOCUMENT_ROOT.'/compta/cashcontrol/class/cashcontrol.class.php';
|
||||
|
||||
|
|
|
|||
|
|
@ -130,8 +130,9 @@ if ($resql)
|
|||
$num = $db->num_rows($resql);
|
||||
$i = 0;
|
||||
|
||||
print "<!-- title of cash fence -->\n";
|
||||
print "<center><h2>";
|
||||
if ($cashcontrol->status == 2) print $langs->trans("CashControl")." ".$cashcontrol->id;
|
||||
if ($cashcontrol->status != $cashcontrol::STATUS_DRAFT) print $langs->trans("CashControl")." ".$cashcontrol->id;
|
||||
else print $langs->trans("CashControl")." - ".$langs->trans("Draft");
|
||||
print "<br>".$langs->trans("DateCreationShort").": ".dol_print_date($cashcontrol->date_creation, 'dayhour')."</h2></center>";
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue