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

Merge pull request #13367 from FHenry/dev_ldcompta10

Browse Source 
fix ldcompta10
This commit is contained in:
Laurent Destailleur 2020-03-18 18:21:55 +01:00 committed by GitHub
commit 889f1be0b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
htdocs/accountancy/class/accountancyexport.class.php
View File

@ -1088,9 +1088,23 @@ class AccountancyExport
{ {
$soc = $this->db->fetch_object($resql); $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_enregistrement = 'C';
//TYPE
print $type_enregistrement.$separator; print $type_enregistrement.$separator;
//NOCL //NOCL
print $soc->code_client.$separator; print $soc->code_client.$separator;
@ -1099,15 +1113,15 @@ class AccountancyExport
//LIBI //LIBI
print $separator; print $separator;
//TITR //TITR
print getFormeJuridiqueLabel($soc->fk_forme_juridique).$separator; print $separator;
//RSSO //RSSO
print $soc->nom.$separator; print $soc->nom.$separator;
//CAD1 //CAD1
print substr($address, 0, 40).$separator; print $address[0].$separator;
//CAD2 //CAD2
print substr($address, 41, 40).$separator; print $address[1].$separator;
//CAD3 //CAD3
print substr($address, 82, 40).$separator; print $address[2].$separator;
//COPO //COPO
print $soc->zip.$separator; print $soc->zip.$separator;
//BUDI //BUDI
@ -1129,7 +1143,7 @@ class AccountancyExport
//COMM //COMM
print $separator; print $separator;
//SIRE //SIRE
print $soc->siret.$separator; print str_replace(" ", "", $soc->siret).$separator;
//RIBP //RIBP
print $separator; print $separator;
//DOBQ //DOBQ
@ -1267,8 +1281,6 @@ class AccountancyExport
} else { } else {
print $separator; print $separator;
} }
// SECT
print $separator;
// CTRE // CTRE
print $separator; print $separator;
// NORL // NORL
@ -1286,13 +1298,13 @@ class AccountancyExport
// CDES // CDES
print $separator; print $separator;
// QTUE // QTUE
print '0'.$separator; print $separator;
// MTDV // MTDV
print $separator;
// CODV
print '0'.$separator; print '0'.$separator;
// TXDV // CODV
print $separator; print $separator;
// TXDV
print '0'.$separator;
// MOPM // MOPM
print $separator; print $separator;
// BONP // BONP