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

Fix array of field names passed to class/method when using a field with compute rule

Browse Source
This commit is contained in:
Jyhere 2023-03-27 15:49:19 +02:00
parent dc464d09f6
commit 79a0b78116
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -649,7 +649,7 @@ class ImportCsv extends ModeleImports
break; break;
} }
$classinstance = new $class($this->db); $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. $newval = $res; // We get new value computed.
} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric') { } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric') {
$newval = price2num($newval); $newval = price2num($newval);
@ -809,7 +809,7 @@ class ImportCsv extends ModeleImports
break; break;
} }
$classinstance = new $class($this->db); $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); $fieldArr = explode('.', $fieldname);
if (count($fieldArr) > 0) { if (count($fieldArr) > 0) {
$fieldname = $fieldArr[1]; $fieldname = $fieldArr[1];

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

@ -694,7 +694,7 @@ class ImportXlsx extends ModeleImports
break; break;
} }
$classinstance = new $class($this->db); $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. $newval = $res; // We get new value computed.
} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric') { } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric') {
$newval = price2num($newval); $newval = price2num($newval);
@ -853,7 +853,7 @@ class ImportXlsx extends ModeleImports
break; break;
} }
$classinstance = new $class($this->db); $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); $fieldArr = explode('.', $fieldname);
if (count($fieldArr) > 0) { if (count($fieldArr) > 0) {
$fieldname = $fieldArr[1]; $fieldname = $fieldArr[1];