diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 02a60d4764a6e..f1423681e4b05 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -3674,16 +3674,16 @@ // By default if $action=='presend' $titreform='SendBillByMail'; $topicmail='SendBillRef'; - $action='send'; $modelmail='facture_send'; if ($action == 'prerelance') // For backward compatibility { $titrefrom='SendReminderBillByMail'; $topicmail='SendReminderBillRef'; - $action='relance'; $modelmail='facture_relance'; + $action='relance'; } + else $action='send'; $ref = dol_sanitizeFileName($object->ref); include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php'; diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php index a8fc47ba413f2..7d1c9e310de02 100644 --- a/htdocs/main.inc.php +++ b/htdocs/main.inc.php @@ -1442,8 +1442,9 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a // Link to print main content area if (empty($conf->global->MAIN_PRINT_DISABLELINK) && empty($conf->browser->phone)) { - $qs=$_SERVER["QUERY_STRING"].($_SERVER["QUERY_STRING"]?'&':'').$morequerystring; - $text =''; + $qs=$_SERVER["QUERY_STRING"]; + $qs.=(($qs && $morequerystring)?'&':'').$morequerystring; + $text =''; $text.= img_picto('', 'printer.png', 'class="printer"'); $text.=''; $toprightmenu.=$form->textwithtooltip('',$langs->trans("PrintContentArea"),2,1,$text,'',1); diff --git a/htdocs/product/fiche.php b/htdocs/product/fiche.php index f3817028e1508..d9ba420c8b549 100644 --- a/htdocs/product/fiche.php +++ b/htdocs/product/fiche.php @@ -684,7 +684,7 @@ $tmpcode=''; if (! empty($modCodeProduct->code_auto)) $tmpcode=$modCodeProduct->getNextValue($object,$type); - print ''.$langs->trans("Ref").''; + print ''.$langs->trans("Ref").''; if ($_error) { print $langs->trans("RefAlreadyExists"); @@ -862,7 +862,7 @@ print ''; // Ref - print ''; + print ''; // Label print ''; diff --git a/htdocs/product/stock/fiche.php b/htdocs/product/stock/fiche.php index db8dbc6de1be0..5a7170d23c31b 100644 --- a/htdocs/product/stock/fiche.php +++ b/htdocs/product/stock/fiche.php @@ -270,8 +270,11 @@ // Country print '';
'.$langs->trans("Ref").'
'.$langs->trans("Ref").'
'.$langs->trans("Label").'
'.$langs->trans('Country').''; - $img=picto_from_langcode($object->country_code); - print ($img?$img.' ':''); + if (! empty($object->country_code)) + { + $img=picto_from_langcode($object->country_code); + print ($img?$img.' ':''); + } print $object->country; print '