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

Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0

Browse Source 
Conflicts:
	htdocs/product/composition/card.php
	htdocs/public/notice.php
This commit is contained in:
Laurent Destailleur 2020-06-19 00:42:20 +02:00
commit 623a9db4e7
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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')));
} }