Merge pull request #21927 from dolibit-ut/patch-454
Update import_csv.modules.php
This commit is contained in:
commit
f0d1876a0b
@ -115,7 +115,7 @@ class ImportCsv extends ModeleImports
|
||||
|
||||
$this->datatoimport = $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') {
|
||||
if (strtolower($newval) == 'auto') {
|
||||
$this->thirpartyobject->get_codeclient(0, 0);
|
||||
$newval = $this->thirpartyobject->code_client;
|
||||
$this->thirdpartyobject->get_codeclient(0, 0);
|
||||
$newval = $this->thirdpartyobject->code_client;
|
||||
//print 'code_client='.$newval;
|
||||
}
|
||||
if (empty($newval)) {
|
||||
@ -569,8 +569,8 @@ class ImportCsv extends ModeleImports
|
||||
}
|
||||
} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsuppliercodeifauto') {
|
||||
if (strtolower($newval) == 'auto') {
|
||||
$newval = $this->thirpartyobject->get_codefournisseur(0, 1);
|
||||
$newval = $this->thirpartyobject->code_fournisseur;
|
||||
$newval = $this->thirdpartyobject->get_codefournisseur(0, 1);
|
||||
$newval = $this->thirdpartyobject->code_fournisseur;
|
||||
//print 'code_fournisseur='.$newval;
|
||||
}
|
||||
if (empty($newval)) {
|
||||
@ -578,8 +578,8 @@ class ImportCsv extends ModeleImports
|
||||
}
|
||||
} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getcustomeraccountancycodeifauto') {
|
||||
if (strtolower($newval) == 'auto') {
|
||||
$this->thirpartyobject->get_codecompta('customer');
|
||||
$newval = $this->thirpartyobject->code_compta;
|
||||
$this->thirdpartyobject->get_codecompta('customer');
|
||||
$newval = $this->thirdpartyobject->code_compta;
|
||||
//print 'code_compta='.$newval;
|
||||
}
|
||||
if (empty($newval)) {
|
||||
@ -587,8 +587,8 @@ class ImportCsv extends ModeleImports
|
||||
}
|
||||
} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'getsupplieraccountancycodeifauto') {
|
||||
if (strtolower($newval) == 'auto') {
|
||||
$this->thirpartyobject->get_codecompta('supplier');
|
||||
$newval = $this->thirpartyobject->code_compta_fournisseur;
|
||||
$this->thirdpartyobject->get_codecompta('supplier');
|
||||
$newval = $this->thirdpartyobject->code_compta_fournisseur;
|
||||
if (empty($newval)) {
|
||||
$arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user