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

Merge pull request #1387 from atm-maxime/3.5

Browse Source 
Fix : big bug while importing thirds
This commit is contained in:
Laurent Destailleur 2014-01-21 04:03:45 -08:00
commit d35cbb27de
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -443,7 +443,7 @@ class ImportCsv extends ModeleImports
} }
elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getcustomercodeifnull') elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getcustomercodeifnull')
{ {
if (empty($newval) || $newval='auto') if (empty($newval) || $newval=='auto')
{ {
$this->thirpartyobject->get_codeclient(0,0); $this->thirpartyobject->get_codeclient(0,0);
$newval=$this->thirpartyobject->code_client; $newval=$this->thirpartyobject->code_client;
@ -452,7 +452,7 @@ class ImportCsv extends ModeleImports
} }
elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getsuppliercodeifnull') elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getsuppliercodeifnull')
{ {
if (empty($newval) || $newval='auto') if (empty($newval) || $newval=='auto')
{ {
$newval=$this->thirpartyobject->get_codefournisseur(0,1); $newval=$this->thirpartyobject->get_codefournisseur(0,1);
$newval=$this->thirpartyobject->code_fournisseur; $newval=$this->thirpartyobject->code_fournisseur;
@ -461,7 +461,7 @@ class ImportCsv extends ModeleImports
} }
elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getcustomeraccountancycodeifnull') elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getcustomeraccountancycodeifnull')
{ {
if (empty($newval) || $newval='auto') if (empty($newval) || $newval=='auto')
{ {
$this->thirpartyobject->get_codecompta('customer'); $this->thirpartyobject->get_codecompta('customer');
$newval=$this->thirpartyobject->code_compta; $newval=$this->thirpartyobject->code_compta;
@ -470,7 +470,7 @@ class ImportCsv extends ModeleImports
} }
elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getsupplieraccountancycodeifnull') elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='getsupplieraccountancycodeifnull')
{ {
if (empty($newval) || $newval='auto') if (empty($newval) || $newval=='auto')
{ {
$this->thirpartyobject->get_codecompta('supplier'); $this->thirpartyobject->get_codecompta('supplier');
$newval=$this->thirpartyobject->code_compta_fournisseur; $newval=$this->thirpartyobject->code_compta_fournisseur;