From 567f7e5365ead8c4e0e372fbc62b65df3da2d330 Mon Sep 17 00:00:00 2001
From: Sergio Sanchis Climent <sergiosanchis@hotmail.com>
Date: Fri, 14 Oct 2016 00:43:10 +0200
Subject: [PATCH] FIX: #5340
---
htdocs/core/modules/import/import_csv.modules.php | 4 ++++
htdocs/core/modules/modSociete.class.php | 3 ++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index da59679b1be..2db005c5646 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -504,6 +504,10 @@ class ImportCsv extends ModeleImports
}
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
index 778fd7a9865..5116f94ae24 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -405,7 +405,8 @@ class modSociete extends DolibarrModules
'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])?$');
--
GitLab