Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-07 10:08:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix errors

Browse Source
This commit is contained in:
Laurent Destailleur
2018-02-17 01:16:52 +01:00
parent d233c152a7
commit ab6d0d2530
2 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/contrat/class/contrat.class.php
View File

@@ -283,7 +283,7 @@ class Contrat extends CommonObject
if ($result < 0)
{
$error++;
$this->errors = $contratline->error;
$this->error = $contratline->error;
$this->errors = $contratline->errors;
break;
}
@@ -338,7 +338,7 @@ class Contrat extends CommonObject
if ($result < 0)
{
$error++;
$this->errors = $contratline->error;
$this->error = $contratline->error;
$this->errors = $contratline->errors;
break;
}

90
htdocs/core/lib/functions.lib.php
View File

@@ -2205,19 +2205,19 @@ function dol_print_phone($phone,$countrycode='',$cid=0,$socid=0,$addlink='',$sep
if (dol_strlen($phone) == 10) {
$newphone=substr($newphone,0,2).$separ.substr($newphone,2,2).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2);
}
elseif (dol_strlen($newphone) == 7)
elseif (dol_strlen($phone) == 7)
{
$newphone=substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,2);
}
elseif (dol_strlen($newphone) == 9)
elseif (dol_strlen($phone) == 9)
{
$newphone=substr($newphone,0,2).$separ.substr($newphone,2,3).$separ.substr($newphone,5,2).$separ.substr($newphone,7,2);
}
elseif (dol_strlen($newphone) == 11)
elseif (dol_strlen($phone) == 11)
{
$newphone=substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,2).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2);
}
elseif (dol_strlen($newphone) == 12)
elseif (dol_strlen($phone) == 12)
{
$newphone=substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
}
@@ -2231,251 +2231,251 @@ function dol_print_phone($phone,$countrycode='',$cid=0,$socid=0,$addlink='',$sep
}
elseif (strtoupper($countrycode) == "PT" )
{//Portugal
if (dol_strlen($object) == 13)
if (dol_strlen($phone) == 13)
{//ex: +351_ABC_DEF_GHI
$newphone= substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,3);
}
}
elseif (strtoupper($countrycode) == "SR" )
{//Suriname
if (dol_strlen($object) == 10)
if (dol_strlen($phone) == 10)
{//ex: +597_ABC_DEF
$newphone= substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3);
}
elseif (dol_strlen($object) == 11)
elseif (dol_strlen($phone) == 11)
{//ex: +597_ABC_DEFG
$newphone= substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,4);
}
}
elseif (strtoupper($countrycode) == "DE" )
{//Allemagne
if (dol_strlen($object) == 14)
if (dol_strlen($phone) == 14)
{//ex: +49_ABCD_EFGH_IJK
$newphone= substr($newphone,0,3).$separ.substr($newphone,3,4).$separ.substr($newphone,7,4).$separ.substr($newphone,11,3);
}
elseif (dol_strlen($object) == 13)
elseif (dol_strlen($phone) == 13)
{//ex: +49_ABC_DEFG_HIJ
$newphone= substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,4).$separ.substr($newphone,10,3);
}
}
elseif (strtoupper($countrycode) == "ES")
{//Espagne
if (dol_strlen($object) == 12)
if (dol_strlen($phone) == 12)
{//ex: +34_ABC_DEF_GHI
$newphone= substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,3);
}
}
elseif (strtoupper($countrycode) == "BF")
{// Burkina Faso
if (dol_strlen($newphone) == 12)
if (dol_strlen($phone) == 12)
{//ex : +22 A BC_DE_FG_HI
$newphone= substr($newphone,0,3).$separ.substr($newphone,3,1).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
}
}
elseif (strtoupper($countrycode) == "RO")
{// Roumanie
if (dol_strlen($newphone) == 12)
if (dol_strlen($phone) == 12)
{//ex : +40 AB_CDE_FG_HI
$newphone= substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,3).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
}
}
elseif (strtoupper($countrycode) == "TR")
{//Turquie
if (dol_strlen($object) == 13)
if (dol_strlen($phone) == 13)
{//ex : +90 ABC_DEF_GHIJ
$newphone= substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,4);
}
}
elseif (strtoupper($countrycode) == "US")
{//Etat-Unis
if (dol_strlen($newphone) == 12)
if (dol_strlen($phone) == 12)
{//ex: +1 ABC_DEF_GHIJ
$newphone= substr($newphone,0,2).$separ.substr($newphone,2,3).$separ.substr($newphone,5,3).$separ.substr($newphone,8,4);
}
}
elseif (strtoupper($countrycode) == "MX")
{//Mexique
if (dol_strlen($newphone) == 12)
if (dol_strlen($phone) == 12)
{//ex: +52 ABCD_EFG_HI
$newphone = substr($newphone,0,3).$separ.substr($newphone,3,4).$separ.substr($newphone,7,3).$separ.substr($newphone,10,2);
}
elseif (dol_strlen($newphone) == 11)
elseif (dol_strlen($phone) == 11)
{//ex: +52 AB_CD_EF_GH
$newphone = substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,2).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2);
}
elseif (dol_strlen($newphone) == 13)
elseif (dol_strlen($phone) == 13)
{//ex: +52 ABC_DEF_GHIJ
$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,4);
}
}
elseif (strtoupper($countrycode) == "ML")
{//Mali
if(dol_strlen($newphone) == 12)
if(dol_strlen($phone) == 12)
{//ex: +223 AB_CD_EF_GH
$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
}
}
elseif (strtoupper($countrycode) == "TH")
{//Thaïlande
if(dol_strlen($newphone) == 11)
if(dol_strlen($phone) == 11)
{//ex: +66_ABC_DE_FGH
$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,2).$separ.substr($newphone,8,3);
}
elseif(dol_strlen($newphone) == 12)
elseif(dol_strlen($phone) == 12)
{//ex: +66_A_BCD_EF_GHI
$newphone = substr($newphone,0,3).$separ.substr($newphone,3,1).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,3);
}
}
elseif (strtoupper($countrycode) == "MU")
{//Maurice
if(dol_strlen($newphone) == 11)
if(dol_strlen($phone) == 11)
{//ex: +230_ABC_DE_FG
$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2);
}
elseif(dol_strlen($newphone) == 12)
elseif(dol_strlen($phone) == 12)
{//ex: +230_ABCD_EF_GH
$newphone = substr($newphone,0,4).$separ.substr($newphone,4,4).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
}
}
elseif (strtoupper($countrycode) == "ZA")
{//Afrique du sud
if(dol_strlen($newphone) == 12)
if(dol_strlen($phone) == 12)
{//ex: +27_AB_CDE_FG_HI
$newphone = substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,3).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
}
}
elseif (strtoupper($countrycode) == "SY")
{//Syrie
if(dol_strlen($newphone) == 12)
if(dol_strlen($phone) == 12)
{//ex: +963_AB_CD_EF_GH
$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
}
elseif(dol_strlen($newphone) == 13)
elseif(dol_strlen($phone) == 13)
{//ex: +963_AB_CD_EF_GHI
$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,3);
}
}
elseif (strtoupper($countrycode) == "AE")
{//Emirats Arabes Unis
if(dol_strlen($newphone) == 12)
if(dol_strlen($phone) == 12)
{//ex: +971_ABC_DEF_GH
$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,2);
}
elseif(dol_strlen($newphone) == 13)
elseif(dol_strlen($phone) == 13)
{//ex: +971_ABC_DEF_GHI
$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,3);
}
elseif(dol_strlen($newphone) == 14)
elseif(dol_strlen($phone) == 14)
{//ex: +971_ABC_DEF_GHIK
$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,4);
}
}
elseif (strtoupper($countrycode) == "DZ")
{//Algérie
if(dol_strlen($newphone) == 13)
if(dol_strlen($phone) == 13)
{//ex: +213_ABC_DEF_GHI
$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,3).$separ.substr($newphone,10,3);
}
}
elseif (strtoupper($countrycode) == "BE")
{//Belgique
if(dol_strlen($newphone) == 11)
if(dol_strlen($phone) == 11)
{//ex: +32_ABC_DE_FGH
$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,2).$separ.substr($newphone,8,3);
}
elseif(dol_strlen($newphone) == 12)
elseif(dol_strlen($phone) == 12)
{//ex: +32_ABC_DEF_GHI
$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,3);
}
}
elseif (strtoupper($countrycode) == "PF")
{//Polynésie française
if(dol_strlen($newphone) == 12)
if(dol_strlen($phone) == 12)
{//ex: +689_AB_CD_EF_GH
$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
}
}
elseif (strtoupper($countrycode) == "CO")
{//Colombie
if(dol_strlen($newphone) == 13)
if(dol_strlen($phone) == 13)
{//ex: +57_ABC_DEF_GH_IJ
$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
}
}
elseif (strtoupper($countrycode) == "JO")
{//Jordanie
if(dol_strlen($newphone) == 12)
if(dol_strlen($phone) == 12)
{//ex: +962_A_BCD_EF_GH
$newphone = substr($newphone,0,4).$separ.substr($newphone,4,1).$separ.substr($newphone,5,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2);
}
}
elseif (strtoupper($countrycode) == "MG")
{//Madagascar
if(dol_strlen($newphone) == 13)
if(dol_strlen($phone) == 13)
{//ex: +261_AB_CD_EF_GHI
$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,2).$separ.substr($newphone,8,2).$separ.substr($newphone,10,3);
}
}
elseif (strtoupper($countrycode) == "GB")
{//Royaume uni
if(dol_strlen($newphone) == 13)
if(dol_strlen($phone) == 13)
{//ex: +44_ABCD_EFG_HIJ
$newphone = substr($newphone,0,3).$separ.substr($newphone,3,4).$separ.substr($newphone,7,3).$separ.substr($newphone,10,3);
}
}
elseif (strtoupper($countrycode) == "CH")
{//Suisse
if(dol_strlen($newphone) == 12)
if(dol_strlen($phone) == 12)
{//ex: +41_AB_CDE_FG_HI
$newphone = substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,3).$separ.substr($newphone,8,2).$separ.substr($newphone,10,2);
}
elseif(dol_strlen($newphone) == 15)
elseif(dol_strlen($phone) == 15)
{// +41_AB_CDE_FGH_IJKL
$newphone =$newphone = substr($newphone,0,3).$separ.substr($newphone,3,2).$separ.substr($newphone,5,3).$separ.substr($newphone,8,3).$separ.substr($newphone,11,4);
}
}
elseif (strtoupper($countrycode) == "TN")
{//Tunisie
if(dol_strlen($newphone) == 12)
if(dol_strlen($phone) == 12)
{//ex: +216_AB_CDE_FGH
$newphone = substr($newphone,0,4).$separ.substr($newphone,4,2).$separ.substr($newphone,6,3).$separ.substr($newphone,9,3);
}
}
elseif (strtoupper($countrycode) == "GF")
{//Guyane francaise
if(dol_strlen($newphone) == 13)
if(dol_strlen($phone) == 13)
{//ex: +594_ABC_DE_FG_HI (ABC=594 de nouveau)
$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
}
}
elseif (strtoupper($countrycode) == "GP")
{//Guadeloupe
if(dol_strlen($newphone) == 13)
if(dol_strlen($phone) == 13)
{//ex: +590_ABC_DE_FG_HI (ABC=590 de nouveau)
$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
}
}
elseif (strtoupper($countrycode) == "MQ")
{//Martinique
if(dol_strlen($newphone) == 13)
if(dol_strlen($phone) == 13)
{//ex: +596_ABC_DE_FG_HI (ABC=596 de nouveau)
$newphone = substr($newphone,0,4).$separ.substr($newphone,4,3).$separ.substr($newphone,7,2).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
}
}
elseif (strtoupper($countrycode) == "IT")
{//Italie
if(dol_strlen($newphone) == 12)
if(dol_strlen($phone) == 12)
{//ex: +39_ABC_DEF_GHI
$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,3);
}
elseif(dol_strlen($newphone) == 13)
elseif(dol_strlen($phone) == 13)
{//ex: +39_ABC_DEF_GH_IJ
$newphone = substr($newphone,0,3).$separ.substr($newphone,3,3).$separ.substr($newphone,6,3).$separ.substr($newphone,9,2).$separ.substr($newphone,11,2);
}
}
elseif(strtoupper($countrycode) == "AU")
{//Australie
if(dol_strlen($newphone) == 12)
if(dol_strlen($phone) == 12)
{//ex: +61_A_BCDE_FGHI
$newphone = substr($newphone,0,3).$separ.substr($newphone,3,1).$separ.substr($newphone,4,4).$separ.substr($newphone,8,4);
}