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

Merge branch '12.0' of github.com:Dolibarr/dolibarr into 12_fixAdvTargetTplWarning

Browse Source
This commit is contained in:
florian HENRY 2020-06-19 09:49:50 +02:00
commit c2920083d8
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/barcode/codeinit.php
View File

@ -193,7 +193,7 @@ llxHeader('', $langs->trans("MassBarcodeInit"));
print load_fiche_titre($langs->trans("MassBarcodeInit"), '', 'title_setup.png'); print load_fiche_titre($langs->trans("MassBarcodeInit"), '', 'title_setup.png');
print '<br>'; print '<br>';
print $langs->trans("MassBarcodeInitDesc").'<br>'; print '<span class="opacitymedium">'.$langs->trans("MassBarcodeInitDesc").'</span><br>';
print '<br>'; print '<br>';
//print img_picto('','puce').' '.$langs->trans("PrintsheetForOneBarCode").'<br>'; //print img_picto('','puce').' '.$langs->trans("PrintsheetForOneBarCode").'<br>';
@ -317,6 +317,12 @@ if ($conf->product->enabled || $conf->product->service)
} }
print load_fiche_titre($langs->trans("BarCodePrintsheet"), '', 'generic');
print '<br>'."\n";
print $langs->trans("ClickHereToGoTo").' : <a href="'.DOL_URL_ROOT.'/barcode/printsheet.php">'.$langs->trans("BarCodePrintsheet").'</a>';
print '</form>'; print '</form>';
print '<br>'; print '<br>';

2
htdocs/barcode/printsheet.php
View File

@ -267,7 +267,7 @@ llxHeader('', $langs->trans("BarCodePrintsheet"));
print load_fiche_titre($langs->trans("BarCodePrintsheet"), '', 'barcode'); print load_fiche_titre($langs->trans("BarCodePrintsheet"), '', 'barcode');
print '<br>'; print '<br>';
print $langs->trans("PageToGenerateBarCodeSheets", $langs->transnoentitiesnoconv("BuildPageToPrint")).'<br>'; print '<span class="opacitymedium">'.$langs->trans("PageToGenerateBarCodeSheets", $langs->transnoentitiesnoconv("BuildPageToPrint")).'</span><br>';
print '<br>'; print '<br>';
dol_htmloutput_errors($mesg); dol_htmloutput_errors($mesg);

1
htdocs/product/composition/card.php
View File

@ -71,6 +71,7 @@ if ($action == 'add_prod' && ($user->rights->produit->creer || $user->rights->se
{ {
$error = 0; $error = 0;
$maxprod = GETPOST("max_prod", 'int'); $maxprod = GETPOST("max_prod", 'int');
for ($i = 0; $i < $maxprod; $i++) for ($i = 0; $i < $maxprod; $i++)
{ {
$qty = price2num(GETPOST("prod_qty_".$i, 'alpha'), 'MS'); $qty = price2num(GETPOST("prod_qty_".$i, 'alpha'), 'MS');

10
htdocs/public/notice.php
View File

@ -1,5 +1,5 @@
<?php <?php
/* Copyright (C) 2016-2018 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2016-2020 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -26,6 +26,7 @@
define('NOCSRFCHECK', 1); define('NOCSRFCHECK', 1);
define('NOLOGIN', 1); define('NOLOGIN', 1);
define('NOSESSION', 1);
require '../main.inc.php'; require '../main.inc.php';
@ -41,9 +42,8 @@ if (!GETPOST('transkey', 'alphanohtml') && !GETPOST('transphrase', 'alphanohtml'
} }
else else
{ {
$langs->load("error"); $langs->loadLangs(array("error", "other"));
$langs->load("other");
if (GETPOST('transphrase', 'alphanohtml')) print GETPOST('transphrase', 'alphanohtml'); if (GETPOST('transphrase', 'alphanohtml')) print dol_escape_htmltag(GETPOST('transphrase', 'alphanohtml'));
if (GETPOST('transkey', 'alphanohtml')) print $langs->trans(GETPOST('transkey', 'alphanohtml')); elseif (GETPOST('transkey', 'alphanohtml')) print dol_escape_htmltag($langs->trans(GETPOST('transkey', 'alphanohtml')));
} }