diff --git a/htdocs/barcode/codeinit.php b/htdocs/barcode/codeinit.php index 1bfb1836a39..a75aaa5543d 100644 --- a/htdocs/barcode/codeinit.php +++ b/htdocs/barcode/codeinit.php @@ -193,7 +193,7 @@ llxHeader('', $langs->trans("MassBarcodeInit")); print load_fiche_titre($langs->trans("MassBarcodeInit"), '', 'title_setup.png'); print '
'; -print $langs->trans("MassBarcodeInitDesc").'
'; +print ''.$langs->trans("MassBarcodeInitDesc").'
'; print '
'; //print img_picto('','puce').' '.$langs->trans("PrintsheetForOneBarCode").'
'; @@ -317,6 +317,12 @@ if ($conf->product->enabled || $conf->product->service) } +print load_fiche_titre($langs->trans("BarCodePrintsheet"), '', 'generic'); +print '
'."\n"; +print $langs->trans("ClickHereToGoTo").' : '.$langs->trans("BarCodePrintsheet").''; + + + print ''; print '
'; diff --git a/htdocs/barcode/printsheet.php b/htdocs/barcode/printsheet.php index 5cd988a5bed..cf74a46bb2a 100644 --- a/htdocs/barcode/printsheet.php +++ b/htdocs/barcode/printsheet.php @@ -267,7 +267,7 @@ llxHeader('', $langs->trans("BarCodePrintsheet")); print load_fiche_titre($langs->trans("BarCodePrintsheet"), '', 'barcode'); print '
'; -print $langs->trans("PageToGenerateBarCodeSheets", $langs->transnoentitiesnoconv("BuildPageToPrint")).'
'; +print ''.$langs->trans("PageToGenerateBarCodeSheets", $langs->transnoentitiesnoconv("BuildPageToPrint")).'
'; print '
'; dol_htmloutput_errors($mesg); diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php index dbdb6cb6f42..c166061731c 100644 --- a/htdocs/product/composition/card.php +++ b/htdocs/product/composition/card.php @@ -71,6 +71,7 @@ if ($action == 'add_prod' && ($user->rights->produit->creer || $user->rights->se { $error = 0; $maxprod = GETPOST("max_prod", 'int'); + for ($i = 0; $i < $maxprod; $i++) { $qty = price2num(GETPOST("prod_qty_".$i, 'alpha'), 'MS'); diff --git a/htdocs/public/notice.php b/htdocs/public/notice.php index 626aba2cd32..f0ac4502a94 100644 --- a/htdocs/public/notice.php +++ b/htdocs/public/notice.php @@ -1,5 +1,5 @@ +/* Copyright (C) 2016-2020 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -26,6 +26,7 @@ define('NOCSRFCHECK', 1); define('NOLOGIN', 1); +define('NOSESSION', 1); require '../main.inc.php'; @@ -41,9 +42,8 @@ if (!GETPOST('transkey', 'alphanohtml') && !GETPOST('transphrase', 'alphanohtml' } else { - $langs->load("error"); - $langs->load("other"); + $langs->loadLangs(array("error", "other")); - if (GETPOST('transphrase', 'alphanohtml')) print GETPOST('transphrase', 'alphanohtml'); - if (GETPOST('transkey', 'alphanohtml')) print $langs->trans(GETPOST('transkey', 'alphanohtml')); + if (GETPOST('transphrase', 'alphanohtml')) print dol_escape_htmltag(GETPOST('transphrase', 'alphanohtml')); + elseif (GETPOST('transkey', 'alphanohtml')) print dol_escape_htmltag($langs->trans(GETPOST('transkey', 'alphanohtml'))); }