Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-08 00:52:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17602 from fmarcet/11.0

Browse Source 
FIX: Impossible to add multiple localtax2
This commit is contained in:
Laurent Destailleur
2021-05-17 09:13:58 +02:00
committed by GitHub
parent 6a2afabcac c577d1c51e
commit 592cfb5e93
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/admin/dict.php
View File

@@ -9,7 +9,7 @@
* Copyright (C) 2012-2015 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2012 Christophe Battarel <christophe.battarel@ltairis.fr>
* Copyright (C) 2011-2016 Alexandre Spangaro <aspangaro@open-dsi.fr>
* Copyright (C) 2015 Ferran Marcet <fmarcet@2byte.es>
* Copyright (C) 2015-2021 Ferran Marcet <fmarcet@2byte.es>
* Copyright (C) 2016 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr>
* Copyright (C) 2019 Frédéric France <frederic.france@netlogic.fr>
*
@@ -777,6 +777,9 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
elseif (in_array($keycode, array('joinfile', 'private', 'position', 'scale'))) {
$sql .= (int) GETPOST($keycode, 'int');
}
elseif ($keycode == 'localtax2') {
$sql .= "'".GETPOST($keycode, 'alpha')."'";
}
else {
$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
}
@@ -843,6 +846,9 @@ if (GETPOST('actionadd') || GETPOST('actionmodify'))
elseif (in_array($keycode, array('private', 'position', 'scale'))) {
$sql .= (int) GETPOST($keycode, 'int');
}
elseif ($keycode == 'localtax2') {
$sql .= "'".GETPOST($keycode, 'alpha')."'";
}
else {
$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
}