Merge pull request #5870 from olsesacl/#5340

FIX: #5340 Importing Tiers problem with capital field
Dolibarr · Oct 15, 2016 · dda248c · dda248c
2 parents 02f4f6d + 567f7e5
commit dda248c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
@@ -504,6 +504,10 @@ function import_insert($arrayrecord,$array_match_file_to_database,$objimport,$ma
                                     }
                                     if (empty($newval)) $arrayrecord[($key-1)]['type']=-1;	// If we get empty value, we will use "null"
                                 }
+                                elseif ($objimport->array_import_convertvalue[0][$val]['rule']=='numeric')
+                                {
+                                    $newval = price2num($newval);
+                                }
 
                                 //print 'Val to use as insert is '.$newval.'<br>';
 						    }

diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
@@ -405,7 +405,8 @@ function __construct($db)
 		    's.code_client'=>array('rule'=>'getcustomercodeifauto'),
 		    's.code_fournisseur'=>array('rule'=>'getsuppliercodeifauto'),
 		    's.code_compta'=>array('rule'=>'getcustomeraccountancycodeifauto'),
-		    's.code_compta_fournisseur'=>array('rule'=>'getsupplieraccountancycodeifauto')
+		    's.code_compta_fournisseur'=>array('rule'=>'getsupplieraccountancycodeifauto'),
+		    's.capital'=>array('rule'=>'numeric')
 		);
 		//$this->import_convertvalue_array[$r]=array('s.fk_soc'=>array('rule'=>'lastrowid',table='t');
 		$this->import_regex_array[$r]=array('s.status'=>'^[0|1]','s.client'=>'^[0|1|2|3]','s.fournisseur'=>'^[0|1]','s.fk_typent'=>'id@'.MAIN_DB_PREFIX.'c_typent','s.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]( [0-9][0-9]:[0-9][0-9]:[0-9][0-9])?$');