diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php
index 821da019a73..53515b1835f 100644
--- a/htdocs/admin/notification.php
+++ b/htdocs/admin/notification.php
@@ -28,6 +28,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/triggers/interface_50_modNotification_Noti
$langs->load("admin");
$langs->load("other");
+$langs->load("orders");
+$langs->load("propal");
+$langs->load("bills");
// Security check
if (!$user->admin)
@@ -109,8 +112,14 @@ foreach($listofnotifiedevents as $notifiedevent)
{
$var=!$var;
$label=$langs->trans("Notify_".$notifiedevent['code']); //!=$langs->trans("Notify_".$notifiedevent['code'])?$langs->trans("Notify_".$notifiedevent['code']):$notifiedevent['label'];
+
+ if ($notifiedevent['elementtype'] == 'order_supplier') $elementLabel = $langs->trans('SupplierOrder');
+ elseif ($notifiedevent['elementtype'] == 'propal') $elementLabel = $langs->trans('Proposal');
+ elseif ($notifiedevent['elementtype'] == 'facture') $elementLabel = $langs->trans('Bill');
+ elseif ($notifiedevent['elementtype'] == 'commande') $elementLabel = $langs->trans('Order');
+
print '';
- print '| '.$notifiedevent['elementtype'].' | ';
+ print ''.$elementLabel.' | ';
print ''.$notifiedevent['code'].' | ';
print ''.$label.' | ';
print '
';
diff --git a/htdocs/ftp/admin/ftpclient.php b/htdocs/ftp/admin/ftpclient.php
index 6c304c783cb..b7d322398ea 100644
--- a/htdocs/ftp/admin/ftpclient.php
+++ b/htdocs/ftp/admin/ftpclient.php
@@ -77,7 +77,7 @@ if ($action == 'add' || GETPOST('modify','alpha'))
$ftp_port = "FTP_PORT_" . $entry;
$ftp_user = "FTP_USER_" . $entry;
$ftp_password = "FTP_PASSWORD_" . $entry;
- $ftp_passive = "FTP_PASSIVE_" . $entry;
+ $ftp_passive = "FTP_PASSIVE_" . $entry;
$db->begin();
@@ -86,7 +86,7 @@ if ($action == 'add' || GETPOST('modify','alpha'))
if ($result2) $result3=dolibarr_set_const($db, "FTP_USER_" . $entry,GETPOST($ftp_user,'alpha'),'chaine',0,'',$conf->entity);
if ($result3) $result4=dolibarr_set_const($db, "FTP_PASSWORD_" . $entry,GETPOST($ftp_password,'alpha'),'chaine',0,'',$conf->entity);
if ($result4) $result5=dolibarr_set_const($db, "FTP_NAME_" . $entry,GETPOST($ftp_name,'alpha'),'chaine',0,'',$conf->entity);
- if ($result5) $result6=dolibarr_set_const($db, "FTP_PASSIVE_" . $entry,GETPOST($ftp_passive,'alpha'),'chaine',0,'',$conf->entity);
+ if ($result5) $result6=dolibarr_set_const($db, "FTP_PASSIVE_" . $entry,GETPOST($ftp_passive,'alpha'),'chaine',0,'',$conf->entity);
if ($result1 && $result2 && $result3 && $result4 && $result5 && $result6)
{
@@ -114,7 +114,7 @@ if (GETPOST('delete','alpha'))
if ($result2) $result3=dolibarr_del_const($db,"FTP_USER_" . $entry,$conf->entity);
if ($result3) $result4=dolibarr_del_const($db,"FTP_PASSWORD_" . $entry,$conf->entity);
if ($result4) $result5=dolibarr_del_const($db,"FTP_NAME_" . $entry,$conf->entity);
- if ($result4) $result6=dolibarr_del_const($db,"FTP_PASSIVE_" . $entry,$conf->entity);
+ if ($result4) $result6=dolibarr_del_const($db,"FTP_PASSIVE_" . $entry,$conf->entity);
if ($result1 && $result2 && $result3 && $result4 && $result5 && $result6)
{
@@ -192,7 +192,7 @@ else
print '';
print '';
- print '| '.$langs->trans("Passive").' | ';
+ print ''.$langs->trans("FTPPassiveMode").' | ';
$defaultpassive=GETPOST("FTP_PASSIVE_" . ($lastftpentry+1));
if (! isset($_POST["FTP_PASSIVE_" . ($lastftpentry+1)])) $defaultpassive=empty($conf->global->FTP_SUGGEST_PASSIVE_BYDEFAULT)?0:1;
print ''.$form->selectyesno('FTP_PASSIVE_'.($lastftpentry+1), $defaultpassive, 2).' | ';
@@ -278,7 +278,7 @@ else
$var=!$var;
print "
";
print "| ".$langs->trans("Passive")." | ";
- print ''.$form->selectyesno('FTP_PASSIVE_'.$idrss, @constant("FTP_PASSIVE_" . $idrss), 1).' | ';
+ print ''.$form->selectyesno('FTP_PASSIVE_'.$idrss, @constant("FTP_PASSIVE_" . $idrss), 1).' | ';
print "
";
print "";
diff --git a/htdocs/langs/en_US/ftp.lang b/htdocs/langs/en_US/ftp.lang
index 65b11a7a129..e8e70447185 100644
--- a/htdocs/langs/en_US/ftp.lang
+++ b/htdocs/langs/en_US/ftp.lang
@@ -9,4 +9,5 @@ FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions
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).
\ No newline at end of file
+FTPFailedToRemoveDir=Failed to remove directory %s (Check permissions and that directory is empty).
+FTPPassiveMode=Passive mode
\ No newline at end of file
diff --git a/htdocs/langs/en_US/paypal.lang b/htdocs/langs/en_US/paypal.lang
index 1049658abf2..f06ce5f6309 100644
--- a/htdocs/langs/en_US/paypal.lang
+++ b/htdocs/langs/en_US/paypal.lang
@@ -10,6 +10,8 @@ PAYPAL_API_USER=API username
PAYPAL_API_PASSWORD=API password
PAYPAL_API_SIGNATURE=API signature
PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer payment "integral" (Credit card+Paypal) or "Paypal" only
+PaypalModeIntegral=Integral
+PaypalModeOnlyPaypal=PayPal only
PAYPAL_CSS_URL=Optionnal Url of CSS style sheet on payment page
ThisIsTransactionId=This is id of transaction: %s
PAYPAL_ADD_PAYMENT_URL=Add the url of Paypal payment when you send a document by mail
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index c14ebde7308..a62aa93fc80 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -1179,7 +1179,7 @@ LDAPFieldSidExample=Ejemplo : objectsid
LDAPFieldEndLastSubscription=Fecha finalización como miembro
LDAPParametersAreStillHardCoded=Los parámetros LDAP son codificados en duro (en la clase contact)
LDAPSetupNotComplete=Configuración LDAP incompleta (a completar en las otras pestañas)
-LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Administrador o contraseña no inindicados. Los accesos LDAP serán anónimos y en solo lectura.
+LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Administrador o contraseña no indicados. Los accesos LDAP serán anónimos y en solo lectura.
LDAPDescContact=Esta página permite definir el nombre de los atributos del árbol LDAP para cada información de los contactos Dolibarr.
LDAPDescUsers=Esta página permite definir el nombre de los atributos del árbol LDAP para cada información de los usuarios Dolibarr.
LDAPDescGroups=Esta página permite definir el nombre de los atributos del árbol LDAP para cada información de los grupos usuarios Dolibarr.
diff --git a/htdocs/langs/es_ES/ftp.lang b/htdocs/langs/es_ES/ftp.lang
index 4409603b337..75173ad5338 100644
--- a/htdocs/langs/es_ES/ftp.lang
+++ b/htdocs/langs/es_ES/ftp.lang
@@ -9,4 +9,5 @@ FTPFeatureNotSupportedByYourPHP=Su PHP no soporta las funciones FTP
FailedToConnectToFTPServer=No se pudo conectar con el servidor FTP (servidor: %s, puerto %s)
FailedToConnectToFTPServerWithCredentials=No se pudo conectar con el login/contraseña FTP configurados
FTPFailedToRemoveFile=No se pudo eliminar el archivo %s.
-FTPFailedToRemoveDir=No se pudo eliminar el directorio %s (Compruebe los permisos y que el directorio está vacío).
\ No newline at end of file
+FTPFailedToRemoveDir=No se pudo eliminar el directorio %s (Compruebe los permisos y que el directorio está vacío).
+FTPPassiveMode=Modo pasivo
\ No newline at end of file
diff --git a/htdocs/langs/es_ES/paypal.lang b/htdocs/langs/es_ES/paypal.lang
index d1fc5aefb97..9a4cb77ee55 100644
--- a/htdocs/langs/es_ES/paypal.lang
+++ b/htdocs/langs/es_ES/paypal.lang
@@ -10,6 +10,8 @@ PAYPAL_API_USER=Nombre usuario API
PAYPAL_API_PASSWORD=Contraseña usuario API
PAYPAL_API_SIGNATURE=Firma API
PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Proponer pago integral (Tarjeta+Paypal) o sólo Paypal
+PaypalModeIntegral=Integral
+PaypalModeOnlyPaypal=Sólo PayPal
PAYPAL_CSS_URL=Url opcional de la hoja de estilo CSS de la página de pago
ThisIsTransactionId=Identificador de la transacción: %s
PAYPAL_ADD_PAYMENT_URL=Añadir la url del pago Paypal al enviar un documento por e-mail
diff --git a/htdocs/langs/fr_FR/ftp.lang b/htdocs/langs/fr_FR/ftp.lang
index dca72e7e8dd..e92d32b7ab8 100644
--- a/htdocs/langs/fr_FR/ftp.lang
+++ b/htdocs/langs/fr_FR/ftp.lang
@@ -9,4 +9,5 @@ FTPFeatureNotSupportedByYourPHP=Votre PHP ne supporte pas les fonctions FTP
FailedToConnectToFTPServer=Échec de connexion au serveur FTP (serveur: %s, port %s)
FailedToConnectToFTPServerWithCredentials=Échec de login avec le login/mot de passe FTP configuré
FTPFailedToRemoveFile=Échec suppression fichier %s.
-FTPFailedToRemoveDir=Échec suppression répertoire %s (Vérifiez les permissions et que le répertoire soit vide).
\ No newline at end of file
+FTPFailedToRemoveDir=Échec suppression répertoire %s (Vérifiez les permissions et que le répertoire soit vide).
+FTPPassiveMode=Mode passif
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/paypal.lang b/htdocs/langs/fr_FR/paypal.lang
index b1d627163e3..74d8a76804a 100644
--- a/htdocs/langs/fr_FR/paypal.lang
+++ b/htdocs/langs/fr_FR/paypal.lang
@@ -10,6 +10,8 @@ PAYPAL_API_USER=Nom utilisateur API
PAYPAL_API_PASSWORD=Mot de passe utilisateur API
PAYPAL_API_SIGNATURE=Signature API
PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Proposer le paiement intégral (Carte+Paypal) ou Paypal seul
+PaypalModeIntegral=Intégral
+PaypalModeOnlyPaypal=PayPal seul
PAYPAL_CSS_URL=Url optionnelle de la feuille de style CSS de la page de paiement
ThisIsTransactionId=Voici l'identifiant de la transaction: %s
PAYPAL_ADD_PAYMENT_URL=Ajouter l'url de paiement Paypal lors de l'envoi d'un document par mail
diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index d7336391bfc..93d23f42ac8 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -157,7 +157,7 @@ print "
\n";
$var=!$var;
print '| ';
print $langs->trans("PAYPAL_API_INTEGRAL_OR_PAYPALONLY").' | ';
-print $form->selectarray("PAYPAL_API_INTEGRAL_OR_PAYPALONLY",array('integral'=>'Integral','paypalonly'=>'Paypal only'),$conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY);
+print $form->selectarray("PAYPAL_API_INTEGRAL_OR_PAYPALONLY",array('integral'=> $langs->trans('PaypalModeIntegral'),'paypalonly'=> $langs->trans('PaypalModeOnlyPaypal')),$conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY);
print ' |
';
/*$var=!$var;