diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 8ddb3843696..4cce4716c37 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -168,7 +168,11 @@ function isModEnabled($module) global $conf; // Fix special cases - $arrayconv = array('project' => 'projet'); + $arrayconv = array( + 'project' => 'projet', + 'supplier_order'=>'fournisseur', + 'supplier_invoice'=>'fournisseur' + ); if (!empty($arrayconv[$module])) { $module = $arrayconv[$module]; } diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php index f79c9fe49b4..a5d97b9440d 100644 --- a/htdocs/fourn/commande/card.php +++ b/htdocs/fourn/commande/card.php @@ -1873,6 +1873,7 @@ if ($action == 'create') { } print "\n"; } elseif (!empty($object->id)) { + // view $result = $object->fetch($id, $ref); $object->fetch_thirdparty(); diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php index c0871f5fae0..3e2210b69c7 100644 --- a/htdocs/reception/card.php +++ b/htdocs/reception/card.php @@ -1895,6 +1895,8 @@ if ($action == 'create') { // Qty in other receptions (with reception and warehouse used) if ($origin && $origin_id > 0) { print ''; + $htmltooltip = ''; + $qtyalreadyreceived = 0; if (!array_key_exists($lines[$i]->fk_commandefourndet, $arrayofpurchaselinealreadyoutput)) { foreach ($alreadysent as $key => $val) { if ($lines[$i]->fk_commandefourndet == $key) { @@ -1906,22 +1908,25 @@ if ($action == 'create') { $j++; if ($j > 1) { - print '
'; + $htmltooltip .= '
'; } $reception_static->fetch($receptionline_var['reception_id']); - print $reception_static->getNomUrl(1); - print ' - '.$receptionline_var['qty']; + $htmltooltip .= $reception_static->getNomUrl(1, 0, 0, 0, 1); + $htmltooltip .= ' - '.$receptionline_var['qty']; $htmltext = $langs->trans("DateValidation").' : '.(empty($receptionline_var['date_valid']) ? $langs->trans("Draft") : dol_print_date($receptionline_var['date_valid'], 'dayhour')); if (isModEnabled('stock') && $receptionline_var['warehouse'] > 0) { $warehousestatic->fetch($receptionline_var['warehouse']); $htmltext .= '
'.$langs->trans("From").' : '.$warehousestatic->getNomUrl(1, '', 0, 1); } - print ' '.$form->textwithpicto('', $htmltext, 1); + $htmltooltip .= ' '.$form->textwithpicto('', $htmltext, 1); + + $qtyalreadyreceived += $receptionline_var['qty']; } } } } + print $form->textwithpicto($qtyalreadyreceived, $htmltooltip, 1, 'info', '', 0, 3, 'tooltip'.$lines[$i]->id); print ''; } diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php index f2da87feab5..d60c286ecf6 100644 --- a/htdocs/reception/class/reception.class.php +++ b/htdocs/reception/class/reception.class.php @@ -1257,13 +1257,15 @@ class Reception extends CommonObject $linkstart .= $linkclose.'>'; $linkend = ''; + $result .= $linkstart; if ($withpicto) { - $result .= ($linkstart.img_object(($notooltip ? '' : $label), $this->picto, ($notooltip ? '' : 'class="classfortooltip"'), 0, 0, $notooltip ? 0 : 1).$linkend); + $result .= img_object(($notooltip ? '' : $label), $this->picto, '', 0, 0, $notooltip ? 0 : 1); } - if ($withpicto && $withpicto != 2) { - $result .= ' '; + if ($withpicto != 2) { + $result .= $this->ref; } - $result .= $linkstart.$this->ref.$linkend; + + $result .= $linkend; global $action; $hookmanager->initHooks(array($this->element . 'dao'));