Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Merge pull request #21928 from dolibit-ut/patch-455

Browse Source 
Update import_xlsx.modules.php
This commit is contained in:
Laurent Destailleur
2022-08-29 00:45:01 +02:00
committed by GitHub
parent f0d1876a0b 527f8abe44
commit 62385cf529
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -133,7 +133,7 @@ class ImportXlsx extends ModeleImports
$this->datatoimport = $datatoimport;
if (preg_match('/^societe_/', $datatoimport)) {
$this->thirpartyobject = new Societe($this->db);
$this->thirdpartyobject = new Societe($this->db);
}
}
@@ -604,8 +604,8 @@ class ImportXlsx 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)) {
@@ -613,8 +613,8 @@ class ImportXlsx 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)) {
@@ -622,8 +622,8 @@ class ImportXlsx 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)) {
@@ -631,8 +631,8 @@ class ImportXlsx 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)]['type'] = -1; // If we get empty value, we will use "null"
}