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

Fix no tooltip of not predefined products

Browse Source
This commit is contained in:
Laurent Destailleur 2020-04-20 13:26:06 +02:00
parent b92c03cdf6
commit c7fab6a83e
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/takepos/invoice.php
View File

@ -944,6 +944,7 @@ if ($placeid > 0)
if (is_array($invoice->lines) && count($invoice->lines)) if (is_array($invoice->lines) && count($invoice->lines))
{ {
print '<!-- Show lines of invoices -->'."\n";
$tmplines = array_reverse($invoice->lines); $tmplines = array_reverse($invoice->lines);
foreach ($tmplines as $line) foreach ($tmplines as $line)
{ {
@ -993,12 +994,15 @@ if ($placeid > 0)
else $htmlforlines .= img_object('', 'service').' '; else $htmlforlines .= img_object('', 'service').' ';
} }
if (empty($conf->global->TAKEPOS_SHOW_N_FIRST_LINES)) { if (empty($conf->global->TAKEPOS_SHOW_N_FIRST_LINES)) {
$tooltiptext = '<b>'.$langs->trans("Ref").'</b> : '.$line->product_ref.'<br>'; $tooltiptext = '';
if ($line->product_ref) {
$tooltiptext .= '<b>'.$langs->trans("Ref").'</b> : '.$line->product_ref.'<br>';
$tooltiptext .= '<b>'.$langs->trans("Label").'</b> : '.$line->product_label.'<br>'; $tooltiptext .= '<b>'.$langs->trans("Label").'</b> : '.$line->product_label.'<br>';
if ($line->product_label != $line->desc) { if ($line->product_label != $line->desc) {
if ($line->desc) $tooltiptext .= '<br>'; if ($line->desc) $tooltiptext .= '<br>';
$tooltiptext .= $line->desc; $tooltiptext .= $line->desc;
} }
}
$htmlforlines .= $form->textwithpicto($line->product_label ? $line->product_label : ($line->product_ref ? $line->product_ref : dolGetFirstLineOfText($line->desc, 1)), $tooltiptext); $htmlforlines .= $form->textwithpicto($line->product_label ? $line->product_label : ($line->product_ref ? $line->product_ref : dolGetFirstLineOfText($line->desc, 1)), $tooltiptext);
} else { } else {
if ($line->product_label) $htmlforlines .= $line->product_label; if ($line->product_label) $htmlforlines .= $line->product_label;