diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec index b67677b10cb..2418698e12d 100755 --- a/build/rpm/dolibarr_generic.spec +++ b/build/rpm/dolibarr_generic.spec @@ -552,7 +552,6 @@ else echo "No remove ation done (this is an upgrade)" fi - # version x.y.z-0.1.a for alpha, x.y.z-0.2.b for beta, x.y.z-0.3 for release %changelog * Sun Feb 17 2013 Laurent Destailleur 3.5.0-0.1.a diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php index 6c4cbe157e8..f51a0e91bc4 100644 --- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php +++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php @@ -1185,6 +1185,8 @@ class pdf_einstein extends ModelePDFCommandes $pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4)); $pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L'); } + + $pdf->SetTextColor(0,0,0); } /** diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php index 3541160ef52..9435efde392 100755 --- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php @@ -1414,6 +1414,8 @@ class pdf_crabe extends ModelePDFFactures $pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4)); $pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L'); } + + $pdf->SetTextColor(0,0,0); } /** diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php index ed501026c8a..491665dddd8 100644 --- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php +++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php @@ -1326,6 +1326,8 @@ class pdf_azur extends ModelePDFPropales $pdf->SetXY($posx+2,$posy+4+(dol_nboflines_bis($carac_client_name,50)*4)); $pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L'); } + + $pdf->SetTextColor(0,0,0); } /** diff --git a/htdocs/langs/en_US/bookmarks.lang b/htdocs/langs/en_US/bookmarks.lang index e3042f55b44..562dbc16ffa 100644 --- a/htdocs/langs/en_US/bookmarks.lang +++ b/htdocs/langs/en_US/bookmarks.lang @@ -18,4 +18,4 @@ SetHereATitleForLink=Set a title for the bookmark UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external http URL or a relative Dolibarr URL ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choose if a page opened by link must appear on current or new window BookmarksManagement=Bookmarks management -ListOfBookmarks=List of bookmarks \ No newline at end of file +ListOfBookmarks=List of bookmarks diff --git a/htdocs/langs/en_US/ftp.lang b/htdocs/langs/en_US/ftp.lang index 063c0279f01..2b0042fbe4d 100644 --- a/htdocs/langs/en_US/ftp.lang +++ b/htdocs/langs/en_US/ftp.lang @@ -10,4 +10,4 @@ FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s) FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password FTPFailedToRemoveFile=Failed to remove file %s. FTPFailedToRemoveDir=Failed to remove directory %s (Check permissions and that directory is empty). -FTPPassiveMode=Passive mode \ No newline at end of file +FTPPassiveMode=Passive mode diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang index dd088400260..4ea725ca84f 100644 --- a/htdocs/langs/en_US/other.lang +++ b/htdocs/langs/en_US/other.lang @@ -207,4 +207,4 @@ NoExportableData=No exportable data (no modules with exportable data loaded, or ToExport=Export NewExport=New export ##### External sites ##### -ExternalSites=External sites \ No newline at end of file +ExternalSites=External sites diff --git a/htdocs/langs/fr_FR/bookmarks.lang b/htdocs/langs/fr_FR/bookmarks.lang index c56e20bf38c..ae229f171f7 100644 --- a/htdocs/langs/fr_FR/bookmarks.lang +++ b/htdocs/langs/fr_FR/bookmarks.lang @@ -18,4 +18,4 @@ SetHereATitleForLink=Saisir ici un titre pour le marque-page UseAnExternalHttpLinkOrRelativeDolibarrLink=Saisir une URL HTTP externe ou une URL Dolibarr relative ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Choisir si le raccourci doit ouvrir la page dans une nouvelle fenêtre ou fenêtre courante BookmarksManagement=Gestion des marque-pages -ListOfBookmarks=Liste des marque-pages +ListOfBookmarks=Liste des marque-pages \ No newline at end of file diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang index 6c536bf8e1e..4ac364438c8 100644 --- a/htdocs/langs/fr_FR/other.lang +++ b/htdocs/langs/fr_FR/other.lang @@ -207,4 +207,4 @@ NoExportableData=Pas de données exportables (pas de module avec données export ToExport=Exporter NewExport=Nouvel export ##### External sites ##### -ExternalSites=Sites externes +ExternalSites=Sites externes \ No newline at end of file diff --git a/htdocs/langs/fr_FR/paypal.lang b/htdocs/langs/fr_FR/paypal.lang index 3f6e2a55af5..edeea330d88 100644 --- a/htdocs/langs/fr_FR/paypal.lang +++ b/htdocs/langs/fr_FR/paypal.lang @@ -20,5 +20,4 @@ PredefinedMailContentLink=Vous pouvez cliquer sur le lien sécurisé ci-dessous YouAreCurrentlyInSandboxMode=Vous êtes actuellement dans le mode "sandbox" NewPaypalPaymentReceived=Nouveau paiement Paypal reçu NewPaypalPaymentFailed=Nouveau paiement Paypal tenté mais en échec -PAYPAL_PAYONLINE_SENDEMAIL=EMail à prévenir en cas de paiement (succès ou non) - +PAYPAL_PAYONLINE_SENDEMAIL=EMail à prévenir en cas de paiement (succès ou non) \ No newline at end of file diff --git a/scripts/members/sync_members_ldap2dolibarr.php b/scripts/members/sync_members_ldap2dolibarr.php index 83dfd196ae0..56c91255c7e 100755 --- a/scripts/members/sync_members_ldap2dolibarr.php +++ b/scripts/members/sync_members_ldap2dolibarr.php @@ -341,4 +341,4 @@ function dolValidElement($element) return (trim($element) != ''); } -?> \ No newline at end of file +?>