';
-
+
print '| ';
print $langs->trans("Code");
print ' | ';
print $id;
print ' |
';
-
+
print '| ';
print $langs->trans("DateCreationShort");
print ' | ';
print dol_print_date($cashcontrol->date_creation, 'dayhour');
print ' |
';
-
+
print '| ';
print $langs->trans("DateEnd");
print ' | ';
print dol_print_date(strtotime($cashcontrol->year_close."-".$cashcontrol->month_close."-".$cashcontrol->day_close), 'day');
print ' |
';
-
+
print '| ';
print $langs->trans("Status");
print ' | ';
@@ -177,11 +150,11 @@ if ($action=="view")
print ' |
| '.$langs->trans("InitialBankBalance").' | ';
print price($cashcontrol->opening);
print " |
";
-
+
print '| '.$langs->trans("CashDesk").' ID | ';
print $cashcontrol->posnumber;
print " |
";
-
+
print '| '.$langs->trans("Module").' | ';
print $cashcontrol->posmodule;
print " |
";
@@ -192,13 +165,15 @@ if ($action=="view")
print '';
dol_fiche_end();
-
+
print '';
print '
';
if ($cashcontrol->status==1) print '
';
print '
' . $langs->trans('ProductRef') . ': ' . ($this->ref?$this->ref:$this->id);
+
+ $linkclose='';
+ if (empty($notooltip)) {
+ if (! empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+ $label=$langs->trans("ShowCashFence");
+ $linkclose.=' alt="'.dol_escape_htmltag($label, 1).'"';
+ }
+
+ $linkclose.= ' title="'.dol_escape_htmltag($label, 1, 1).'"';
+ $linkclose.= ' class="classfortooltip"';
+
+ /*
+ $hookmanager->initHooks(array('productdao'));
+ $parameters=array('id'=>$this->id);
+ $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
+ if ($reshook > 0) $linkclose = $hookmanager->resPrint;
+ */
+ }
+
+ $url = DOL_URL_ROOT.'/compta/cashcontrol/cashcontrol_card.php?id='.$this->id;
+
+ if ($option !== 'nolink') {
+ // Add param to save lastsearch_values or not
+ $add_save_lastsearch_values=($save_lastsearch_value == 1 ? 1 : 0);
+ if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) { $add_save_lastsearch_values=1;
+ }
+ if ($add_save_lastsearch_values) { $url.='&save_lastsearch_values=1';
+ }
+ }
+
+ $linkstart = '';
+ $linkend='';
+
+ $result.=$linkstart;
+ if ($withpicto) {
+ $result.=(img_object(($notooltip?'':$label), 'bank', ($notooltip?'class="paddingright"':'class="paddingright classfortooltip"'), 0, 0, $notooltip?0:1));
+ }
+ $result.= $newref;
+ $result.= $linkend;
+
+ global $action;
+ $hookmanager->initHooks(array('cashfencedao'));
+ $parameters=array('id'=>$this->id, 'getnomurl'=>$result);
+ $reshook=$hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+ if ($reshook > 0) { $result = $hookmanager->resPrint;
+ } else { $result .= $hookmanager->resPrint;
+ }
+
+ return $result;
+ }
+}
\ No newline at end of file
diff --git a/htdocs/compta/cashcontrol/report.php b/htdocs/compta/cashcontrol/report.php
index 8dd3075d8c7..c1748134444 100644
--- a/htdocs/compta/cashcontrol/report.php
+++ b/htdocs/compta/cashcontrol/report.php
@@ -7,7 +7,7 @@
* Copyright (C) 2015 Jean-François Ferry
* Copyright (C) 2016 Juanjo Menent
* Copyright (C) 2017 Alexandre Spangaro
- * Copyright (C) 2018 Andreu Bisquerra
+ * Copyright (C) 2018 Andreu Bisquerra
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -25,12 +25,12 @@
/**
* \file htdocs/compta/bank/bankentries_list.php
- * \ingroup banque
+ * \ingroup pos
* \brief List of bank transactions
*/
-$res=@include("../main.inc.php");
-if (! $res) $res=@include("../../main.inc.php");
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/cashcontrol/class/cashcontrol.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
$id = GETPOST('id','int');
@@ -48,7 +48,7 @@ $arrayfields=array(
'b.rowid'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
'b.dateo'=>array('label'=>$langs->trans("DateOperationShort"), 'checked'=>1),
'b.num_chq'=>array('label'=>$langs->trans("Number"), 'checked'=>1),
- 'ba.ref'=>array('label'=>$langs->trans("BankAccount"), 'checked'=>1),
+ 'ba.ref'=>array('label'=>$langs->trans("BankAccount"), 'checked'=>1),
'b.debit'=>array('label'=>$langs->trans("Debit"), 'checked'=>1, 'position'=>600),
'b.credit'=>array('label'=>$langs->trans("Credit"), 'checked'=>1, 'position'=>605),
);
@@ -56,7 +56,7 @@ $arrayfields=array(
/*
* View
*/
-
+
llxHeader('', $langs->trans("CashControl"), '', '', 0, 0, array(), array(), $param);
$sql = "SELECT b.rowid, b.dateo as do, b.datev as dv, b.amount, b.label, b.rappro as conciliated, b.num_releve, b.num_chq,";
@@ -86,10 +86,10 @@ if ($resql)
{
$num = $db->num_rows($resql);
$i = 0;
-
+
print "";
- if ($cashcontrol->status==2) print "Cashcontrol ".$cashcontrol->id;
- else print $langs->trans("Cashcontrol")." - ".$langs->trans("Draft");
+ if ($cashcontrol->status==2) print $langs->trans("CashControl")." ".$cashcontrol->id;
+ else print $langs->trans("CashControl")." - ".$langs->trans("Draft");
print "
".$langs->trans("DateCreationShort").": ".dol_print_date($cashcontrol->date_creation, 'day')."
";
@@ -199,7 +199,7 @@ if ($resql)
$bankaccount = $cachebankaccount[$objp->bankid];
}
print '';
-
+
if ($first==""){
print '| '.$langs->trans("InitialBankBalance").' | | | | '.price($cashcontrol->opening).' |
';
print '';
@@ -275,22 +275,23 @@ if ($resql)
}
print "
";
-
-
+
+
//save totals to DB
$sql = "UPDATE ".MAIN_DB_PREFIX."pos_cash_fence ";
$sql .= "SET";
$sql .= " cash='".$cash."'";
$sql .= ", card='".$bank."'";
- $sql .= " where rowid=".$id;
+ $sql .= " where rowid=".$id;
$db->query($sql);
print "