Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-24 02:11:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into ajaxtooltip

Browse Source
This commit is contained in:
Frédéric FRANCE
2023-03-28 20:08:05 +02:00
parent 78bd96dd58 9a2226139d
commit 3d71cf2d19
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/lib/functions.lib.php
View File

@@ -11409,6 +11409,7 @@ function isAFileWithExecutableContent($filename)
* Return the value of token currently saved into session with name 'newtoken'.
* This token must be send by any POST as it will be used by next page for comparison with value in session.
*
* @since Dolibarr v10.0.7
* @return string
*/
function newToken()
@@ -11420,6 +11421,7 @@ function newToken()
* Return the value of token currently saved into session with name 'token'.
* For ajax call, you must use this token as a parameter of the call into the js calling script (the called ajax php page must also set constant NOTOKENRENEWAL).
*
* @since Dolibarr v10.0.7
* @return string
*/
function currentToken()

4
htdocs/core/modules/import/import_csv.modules.php
View File

@@ -649,7 +649,7 @@ class ImportCsv extends ModeleImports
break;
}
$classinstance = new $class($this->db);
$res = call_user_func_array(array($classinstance, $method), array(&$arrayrecord, $listfields, ($key - 1)));
$res = call_user_func_array(array($classinstance, $method), array(&$arrayrecord, $arrayfield, ($key - 1)));
$newval = $res; // We get new value computed.
} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric') {
$newval = price2num($newval);
@@ -809,7 +809,7 @@ class ImportCsv extends ModeleImports
break;
}
$classinstance = new $class($this->db);
$res = call_user_func_array(array($classinstance, $method), array(&$arrayrecord, $listfields, ($key - 1)));
$res = call_user_func_array(array($classinstance, $method), array(&$arrayrecord, $arrayfield, ($key - 1)));
$fieldArr = explode('.', $fieldname);
if (count($fieldArr) > 0) {
$fieldname = $fieldArr[1];

4
htdocs/core/modules/import/import_xlsx.modules.php
View File

@@ -694,7 +694,7 @@ class ImportXlsx extends ModeleImports
break;
}
$classinstance = new $class($this->db);
$res = call_user_func_array(array($classinstance, $method), array(&$arrayrecord, $listfields, $key));
$res = call_user_func_array(array($classinstance, $method), array(&$arrayrecord, $arrayfield, $key));
$newval = $res; // We get new value computed.
} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric') {
$newval = price2num($newval);
@@ -853,7 +853,7 @@ class ImportXlsx extends ModeleImports
break;
}
$classinstance = new $class($this->db);
$res = call_user_func_array(array($classinstance, $method), array(&$arrayrecord, $listfields, $key));
$res = call_user_func_array(array($classinstance, $method), array(&$arrayrecord, $arrayfield, $key));
$fieldArr = explode('.', $fieldname);
if (count($fieldArr) > 0) {
$fieldname = $fieldArr[1];