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

FIX: We should be able to import value '0'

Browse Source
This commit is contained in:
Laurent Destailleur 2016-04-11 14:56:42 +02:00
parent 695cccca1c
commit 0e7fb80a34
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -401,7 +401,7 @@ class ImportCsv extends ModeleImports
// Make some tests on $newval // Make some tests on $newval
// Is it a required field ? // Is it a required field ?
if (preg_match('/\*/',$objimport->array_import_fields[0][$val]) && ($newval=='')) if (preg_match('/\*/',$objimport->array_import_fields[0][$val]) && ((string) $newval==''))
{ {
$this->errors[$error]['lib']=$langs->trans('ErrorMissingMandatoryValue',$key); $this->errors[$error]['lib']=$langs->trans('ErrorMissingMandatoryValue',$key);
$this->errors[$error]['type']='NOTNULL'; $this->errors[$error]['type']='NOTNULL';

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

@ -419,7 +419,7 @@ class Importxlsx extends ModeleImports
// Make some tests on $newval // Make some tests on $newval
// Is it a required field ? // Is it a required field ?
if (preg_match('/\*/',$objimport->array_import_fields[0][$val]) && ($newval=='')) if (preg_match('/\*/',$objimport->array_import_fields[0][$val]) && ((string) $newval == ''))
{ {
$this->errors[$error]['lib']=$langs->trans('ErrorMissingMandatoryValue',$key); $this->errors[$error]['lib']=$langs->trans('ErrorMissingMandatoryValue',$key);
$this->errors[$error]['type']='NOTNULL'; $this->errors[$error]['type']='NOTNULL';