Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Debug v20

Browse Source
This commit is contained in:
Laurent Destailleur
2024-08-30 15:06:19 +02:00
parent d433e69fd7
commit 2a2ff8dd79
8 changed files with 34 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/lib/functions.lib.php
View File

@@ -6541,8 +6541,8 @@ function vatrate($rate, $addpercent = false, $info_bits = 0, $usestarfornpr = 0,
* @param int<0,1> $form Type of formatting: 1=HTML, 0=no formatting (no by default)
* @param Translate|string|null $outlangs Object langs for output. '' use default lang. 'none' use international separators.
* @param int $trunc 1=Truncate if there is more decimals than MAIN_MAX_DECIMALS_SHOWN (default), 0=Does not truncate. Deprecated because amount are rounded (to unit or total amount accuracy) before being inserted into database or after a computation, so this parameter should be useless.
* @param int $rounding MINIMUM number of decimal to show: 0=no change, -1=we use min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT)
* @param int|string $forcerounding MAXIMUM number of decimal to forcerounding decimal: -1=no change, 'MU' or 'MT' or a numeric to round to MU or MT or to a given number of decimal
* @param int $rounding MINIMUM number of decimal to show: 0=no change, -1=we use min(getDolGlobalString('MAIN_MAX_DECIMALS_UNIT'), getDolGlobalString('MAIN_MAX_DECIMALS_TOT'))
* @param int|string $forcerounding MAXIMUM number of decimal to forcerounding decimal: -1=no change, -2=keep non zero part, 'MU' or 'MT' or a numeric to round to MU or MT or to a given number of decimal
* @param string $currency_code To add currency symbol (''=add nothing, 'auto'=Use default currency, 'XXX'=add currency symbols for XXX currency)
* @return string String with formatted amount
*

4
htdocs/takepos/admin/appearance.php
View File

@@ -84,9 +84,11 @@ print '<form action="'.$_SERVER["PHP_SELF"].'?terminal='.(empty($terminal) ? 1 :
print '<input type="hidden" name="token" value="'.newToken().'">';
print '<input type="hidden" name="action" value="set">';
print '<br>';
print '<table class="noborder centpercent">';
print '<tr class="liste_titre">';
print '<td class="titlefield">'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
print '<td>'.$langs->trans("Parameters").'</td><td></td>';
print "</tr>\n";
// Color theme

2
htdocs/takepos/admin/bar.php
View File

@@ -123,7 +123,7 @@ if (getDolGlobalInt('TAKEPOS_BAR_RESTAURANT')) {
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder centpercent">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Parameters").'</td><td class="">'.$langs->trans("Value").'</td>';
print '<td>'.$langs->trans("Parameters").'</td><td class=""></td>';
print "</tr>\n";
print '<tr class="oddeven value"><td>';

12
htdocs/takepos/admin/other.php
View File

@@ -96,7 +96,10 @@ $url = 'https://www.dolistore.com/45-pos';
print '<tr class="oddeven">'."\n";
print '<td class="titlefield"><a href="'.$url.'" target="_blank" rel="noopener noreferrer external"><img border="0" class="imgautosize imgmaxwidth180" src="'.DOL_URL_ROOT.'/theme/dolistore_logo.png"></a></td>';
print '<td>'.$langs->trans("DolistorePosCategory").'</td>';
print '<td><a href="'.$url.'" target="_blank" rel="noopener noreferrer external">'.$url.'</a></td>';
print '<td>';
print '<a href="'.$url.'" target="_blank" rel="noopener noreferrer external">';
print img_picto('', 'url', 'class="pictofixedwidth"');
print $url.'</a></td>';
print '</tr>';
print "</table>\n";
@@ -118,9 +121,12 @@ print '</tr>';
$url = 'https://www.takepos.com';
print '<tr class="oddeven">'."\n";
print '<td class="left"><a href="'.$url.'" target="_blank" rel="noopener noreferrer external"><img border="0" class="imgautosize imgmaxwidth180" src="../img/takepos.png"></a></td>';
print '<td class="titlefield"><a href="'.$url.'" target="_blank" rel="noopener noreferrer external"><img border="0" class="imgautosize imgmaxwidth180" src="../img/takepos.png"></a></td>';
print '<td>TakePOS original developers</td>';
print '<td><a href="'.$url.'" target="_blank" rel="noopener noreferrer external">'.$url.'</a></td>';
print '<td>';
print '<a href="'.$url.'" target="_blank" rel="noopener noreferrer external">';
print img_picto('', 'url', 'class="pictofixedwidth"');
print $url.'</a></td>';
print '</tr>';
print "</table>\n";

6
htdocs/takepos/admin/receipt.php
View File

@@ -211,12 +211,14 @@ print "</td></tr>\n";
print '</table>';
print '</div>';
print '<br>';
print $form->buttonsSaveCancel("Save", '');
print "</form>\n";
print '<br>';
print load_fiche_titre($langs->trans("Preview"), '', '');
print '<div style="width: 50%; float:center;background-color:#606060">';
print '<center>';

9
htdocs/takepos/admin/setup.php
View File

@@ -248,6 +248,9 @@ print "\n";
print '<br>';
print load_fiche_titre($langs->trans('Options'), '', '');
// Mode
print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -257,7 +260,7 @@ print '<div class="div-table-responsive-no-min">';
print '<table class="noborder centpercent">';
print '<tr class="liste_titre">';
print '<td class="notitlefield">'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
print '<td class="notitlefield">'.$langs->trans("Parameters").'</td><td></td>';
print "</tr>\n";
// Terminals
@@ -477,7 +480,7 @@ if (getDolGlobalInt('TAKEPOS_ENABLE_SUMUP')) {
print '<table class="noborder centpercent">';
print '<tr class="liste_titre">';
print '<td class="titlefield">'.$langs->trans("Sumup").'</td><td>'.$langs->trans("Value").'</td>';
print '<td class="titlefield">'.$langs->trans("Sumup").'</td><td></td>';
print "</tr>\n";
print '<tr class="oddeven"><td>';
@@ -495,8 +498,6 @@ if (getDolGlobalInt('TAKEPOS_ENABLE_SUMUP')) {
print '</div>';
}
print '<br>';
print $form->buttonsSaveCancel("Save", '');
print "</form>\n";

7
htdocs/takepos/admin/terminal.php
View File

@@ -184,7 +184,7 @@ print '<input type="hidden" name="action" value="set">';
print '<div class="div-table-responsive">';
print '<table class="noborder centpercent">';
print '<tr class="liste_titre">';
print '<td>'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
print '<td>'.$langs->trans("Parameters").'</td><td></td>';
print "</tr>\n";
print '<tr class="oddeven"><td class="fieldrequired">'.$langs->trans("TerminalNameDesc").'</td>';
@@ -477,6 +477,9 @@ if (getDolGlobalString('TAKEPOS_ADDON') == "terminal") {
}
print '</table>';
print $form->buttonsSaveCancel("Save", '');
print '</div>';
// add free text on each terminal of cash desk
@@ -536,8 +539,6 @@ if ($atleastonefound == 0 && isModEnabled("bank")) {
print info_admin($langs->trans("AtLeastOneDefaultBankAccountMandatory"), 0, 0, 'error');
}
print '<br>';
print $form->buttonsSaveCancel("Save", '');
print "</form>\n";

7
htdocs/takepos/invoice.php
View File

@@ -2004,13 +2004,18 @@ if ($placeid > 0) {
$stock_real = price2num($obj->reel, 'MS');
}
$htmlforlines .= $line->qty;
$htmlforlines .= '&nbsp; ';
$htmlforlines .= '<span class="opacitylow" title="'.$langs->trans("Stock").' '.price($stock_real, 1, '', 1, 0).'">';
$htmlforlines .= '(';
if ($line->qty && $line->qty > $stock_real) {
$htmlforlines .= '<span style="color: var(--amountremaintopaycolor)">';
}
$htmlforlines .= ' <span class="posstocktoolow">('.$langs->trans("Stock").' '.$stock_real.')</span>';
$htmlforlines .= img_picto('', 'stock', 'class="pictofixedwidth"').price($stock_real, 1, '', 1, 0);
if ($line->qty && $line->qty > $stock_real) {
$htmlforlines .= "</span>";
}
$htmlforlines .= ')';
$htmlforlines .= '</span>';
} else {
dol_print_error($db);
}