From 105c2e99787bb3b7baf9173cefc278e91c686efc Mon Sep 17 00:00:00 2001
From: florian HENRY <florian.henry@atm-consuliting.fr>
Date: Mon, 16 Mar 2020 17:31:16 +0100
Subject: [PATCH] fix ldcompta10

---
 .../class/accountancyexport.class.php         | 37 +++++++++++++------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index bb1f1b8679c..7cfdde49402 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -1088,9 +1088,24 @@ class AccountancyExport
 				{
 					$soc = $this->db->fetch_object($resql);
 
-					$address = str_replace(array("\t", "\n", "\r"), " ", $soc->address);
+	                $address=array('','','');
+                    if (strpos($soc->address,"\n")!==false) {
+	                    $address = explode("\n",$soc->address);
+	                    if (is_array($address) && count($address)>0) {
+	                    	foreach($address as $key=>$data) {
+			                    $address[$key]=str_replace(array("\t", "\n", "\r"), "", $data);
+			                    $address[$key]=dol_trunc($address[$key],40,'right','UTF-8',1);
+		                    }
+	                    }
+                    } else {
+	                    $address[0] =  substr(str_replace(array("\t", "\r"), " ", $soc->address),0,40);
+	                    $address[1] =  substr(str_replace(array("\t", "\r"), " ", $soc->address),41,40);
+	                    $address[2] =  substr(str_replace(array("\t", "\r"), " ", $soc->address),82,40);
+
+                    }
 
 					$type_enregistrement = 'C';
+                    //TYPE
 					print $type_enregistrement.$separator;
 					//NOCL
 					print $soc->code_client.$separator;
@@ -1099,15 +1114,15 @@ class AccountancyExport
 					//LIBI
 					print $separator;
 					//TITR
-					print getFormeJuridiqueLabel($soc->fk_forme_juridique).$separator;
+                    print $separator;
 					//RSSO
 					print $soc->nom.$separator;
 					//CAD1
-					print  substr($address, 0, 40).$separator;
+                    print  $address[0].$separator;
 					//CAD2
-					print  substr($address, 41, 40).$separator;
+                    print  $address[1].$separator;
 					//CAD3
-					print  substr($address, 82, 40).$separator;
+                    print  $address[2].$separator;
 					//COPO
 					print  $soc->zip.$separator;
 					//BUDI
@@ -1129,7 +1144,7 @@ class AccountancyExport
 					//COMM
 					print $separator;
 					//SIRE
-					print $soc->siret.$separator;
+                    print str_replace(" ", "", $soc->siret).$separator;
 					//RIBP
 					print $separator;
 					//DOBQ
@@ -1267,8 +1282,6 @@ class AccountancyExport
 			} else {
 				print $separator;
 			}
-			// SECT
-			print $separator;
 			// CTRE
 			print $separator;
 			// NORL
@@ -1286,13 +1299,13 @@ class AccountancyExport
 			// CDES
 			print $separator;
 			// QTUE
-			print '0'.$separator;
+			print $separator;
 			// MTDV
-			print $separator;
-			// CODV
 			print '0'.$separator;
-			// TXDV
+			// CODV
 			print $separator;
+			// TXDV
+			print '0'.$separator;
 			// MOPM
 			print $separator;
 			// BONP