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

Merge pull request #21927 from dolibit-ut/patch-454

Browse Source 
Update import_csv.modules.php
This commit is contained in:
Laurent Destailleur 2022-08-29 00:44:50 +02:00 committed by GitHub
commit f0d1876a0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,7 +115,7 @@ class ImportCsv extends ModeleImports
$this->datatoimport = $datatoimport; $this->datatoimport = $datatoimport;
if (preg_match('/^societe_/', $datatoimport)) { if (preg_match('/^societe_/', $datatoimport)) {
$this->thirpartyobject = new Societe($this->db); $this->thirdpartyobject = new Societe($this->db);
} }
} }
@ -560,8 +560,8 @@ class ImportCsv extends ModeleImports
} }
} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomercodeifauto') { } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomercodeifauto') {
if (strtolower($newval) == 'auto') { if (strtolower($newval) == 'auto') {
$this->thirpartyobject->get_codeclient(0, 0); $this->thirdpartyobject->get_codeclient(0, 0);
$newval = $this->thirpartyobject->code_client; $newval = $this->thirdpartyobject->code_client;
//print 'code_client='.$newval; //print 'code_client='.$newval;
} }
if (empty($newval)) { if (empty($newval)) {
@ -569,8 +569,8 @@ class ImportCsv extends ModeleImports
} }
} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsuppliercodeifauto') { } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsuppliercodeifauto') {
if (strtolower($newval) == 'auto') { if (strtolower($newval) == 'auto') {
$newval = $this->thirpartyobject->get_codefournisseur(0, 1); $newval = $this->thirdpartyobject->get_codefournisseur(0, 1);
$newval = $this->thirpartyobject->code_fournisseur; $newval = $this->thirdpartyobject->code_fournisseur;
//print 'code_fournisseur='.$newval; //print 'code_fournisseur='.$newval;
} }
if (empty($newval)) { if (empty($newval)) {
@ -578,8 +578,8 @@ class ImportCsv extends ModeleImports
} }
} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomeraccountancycodeifauto') { } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomeraccountancycodeifauto') {
if (strtolower($newval) == 'auto') { if (strtolower($newval) == 'auto') {
$this->thirpartyobject->get_codecompta('customer'); $this->thirdpartyobject->get_codecompta('customer');
$newval = $this->thirpartyobject->code_compta; $newval = $this->thirdpartyobject->code_compta;
//print 'code_compta='.$newval; //print 'code_compta='.$newval;
} }
if (empty($newval)) { if (empty($newval)) {
@ -587,8 +587,8 @@ class ImportCsv extends ModeleImports
} }
} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsupplieraccountancycodeifauto') { } elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsupplieraccountancycodeifauto') {
if (strtolower($newval) == 'auto') { if (strtolower($newval) == 'auto') {
$this->thirpartyobject->get_codecompta('supplier'); $this->thirdpartyobject->get_codecompta('supplier');
$newval = $this->thirpartyobject->code_compta_fournisseur; $newval = $this->thirdpartyobject->code_compta_fournisseur;
if (empty($newval)) { if (empty($newval)) {
$arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null" $arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
} }