lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Debug cashfence feature

Browse Source
This commit is contained in:
Laurent Destailleur 2020-01-24 15:26:18 +01:00
parent 17f28189f9
commit 779cd94b0e
3 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/compta/cashcontrol/cashcontrol_card.php
View File

@ -551,7 +551,9 @@ if (empty($action) || $action == "view")
print '<tr><td class="nowrap">'; print '<tr><td class="nowrap">';
print $langs->trans("Period"); print $langs->trans("Period");
print '</td><td>'; print '</td><td>';
print $object->year_close."-".$object->month_close."-".$object->day_close; print $object->year_close;
print ($object->month_close ? "-" : "").$object->month_close;
print ($object->day_close ? "-" : "").$object->day_close;
print '</td></tr>'; print '</td></tr>';
print '</table>'; print '</table>';
@ -570,7 +572,6 @@ if (empty($action) || $action == "view")
print '<tr><td valign="middle">'.$langs->trans("InitialBankBalance").' - '.$langs->trans("Cash").'</td><td>'; print '<tr><td valign="middle">'.$langs->trans("InitialBankBalance").' - '.$langs->trans("Cash").'</td><td>';
print price($object->opening, 0, $langs, 1, -1, -1, $conf->currency); print price($object->opening, 0, $langs, 1, -1, -1, $conf->currency);
print "</td></tr>"; print "</td></tr>";
foreach ($arrayofpaymentmode as $key => $val) foreach ($arrayofpaymentmode as $key => $val)
{ {
print '<tr><td valign="middle">'.$langs->trans($val).'</td><td>'; print '<tr><td valign="middle">'.$langs->trans($val).'</td><td>';

25
htdocs/compta/cashcontrol/report.php
View File

@ -33,11 +33,11 @@ require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/compta/cashcontrol/class/cashcontrol.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/cashcontrol/class/cashcontrol.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php'; require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
require_once DOL_DOCUMENT_ROOT.'/compta/cashcontrol/class/cashcontrol.class.php';
$id = GETPOST('id', 'int'); $id = GETPOST('id', 'int');
$_GET['optioncss']="print"; $_GET['optioncss']="print";
include_once 'class/cashcontrol.class.php';
$cashcontrol= new CashControl($db); $cashcontrol= new CashControl($db);
$cashcontrol->fetch($id); $cashcontrol->fetch($id);
@ -243,12 +243,25 @@ if ($resql)
print "</table>"; print "</table>";
$cash=$cash+$cashcontrol->opening; $cash = $cash + $cashcontrol->opening;
print "<div style='text-align: right'><h2>"; print "<div style='text-align: right'><h2>";
print $langs->trans("Cash").": ".price($cash)."<br><br>"; print $langs->trans("Cash").": ".price($cash);
print $langs->trans("PaymentTypeCB").": ".price($bank)."<br><br>"; if ($cash != $object->cash) {
print $langs->trans("PaymentTypeCHQ").": ".price($cheque)."<br><br>"; print ' <> <span class="amountremaintopay">'.$langs->trans("Declared").': '.price($cashcontrol->cash).'</span>';
if ($other) print $langs->trans("Other").": ".price($other)."<br><br>"; }
print "<br><br>";
print '<br>';
print $langs->trans("PaymentTypeCHQ").": ".price($cheque);
if ($cash != $object->cheque) {
print ' <> <span class="amountremaintopay">'.$langs->trans("Declared").': '.price($cashcontrol->cheque).'</span>';
}
print "<br><br>";
print '<br>';
print $langs->trans("PaymentTypeCB").": ".price($bank);
print "<br><br>";
if ($other) {
print '<br>'.$langs->trans("Other").": ".price($other)."<br><br>";
}
print "</h2></div>"; print "</h2></div>";
//save totals to DB //save totals to DB

4
htdocs/core/class/html.formfile.class.php
View File

@ -1712,8 +1712,8 @@ class FormFile
if (count($filearray) == 0) if (count($filearray) == 0)
{ {
print '<tr class="oddeven"><td colspan="5">'; print '<tr class="oddeven"><td colspan="5">';
if (empty($textifempty)) print $langs->trans("NoFileFound"); if (empty($textifempty)) print '<span class="opacitymedium">'.$langs->trans("NoFileFound").'</span>';
else print $textifempty; else print '<span class="opacitymedium">'.$textifempty.'</span>';
print '</td></tr>'; print '</td></tr>';
} }
print "</table>"; print "</table>";