diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php
index f00b14fefc0..ad233c25bec 100644
--- a/htdocs/comm/fiche.php
+++ b/htdocs/comm/fiche.php
@@ -429,7 +429,8 @@ if ($_socid > 0)
if ($conf->fichinter->enabled)
{
- print 'Intervention';
+ $langs->load("fichinter");
+ print ''.$langs->trans("AddIntervention").'';
}
print ''.$langs->trans("AddContact").'';
diff --git a/htdocs/comm/pre.inc.php b/htdocs/comm/pre.inc.php
index 277d1c8526c..1d81263a809 100644
--- a/htdocs/comm/pre.inc.php
+++ b/htdocs/comm/pre.inc.php
@@ -87,11 +87,13 @@ function llxHeader($head = "", $title = "")
$menu->add(DOL_URL_ROOT."/commande/index.php", $langs->trans("Orders"));
}
- $menu->add(DOL_URL_ROOT."/comm/mailing/", "Mailing");
+ $langs->load("mails");
+ $menu->add(DOL_URL_ROOT."/comm/mailing/", $langs->trans("EMailings"));
if ($conf->fichinter->enabled )
{
- $menu->add(DOL_URL_ROOT."/fichinter/index.php", "Fiches d'intervention");
+ $langs->load("interventions");
+ $menu->add(DOL_URL_ROOT."/fichinter/index.php", $langs->trans("Interventions"));
}
if ($conf->produit->enabled || $conf->service->enabled)
diff --git a/htdocs/fichinter/pre.inc.php b/htdocs/fichinter/pre.inc.php
index 81a450a8730..841b02f8d87 100644
--- a/htdocs/fichinter/pre.inc.php
+++ b/htdocs/fichinter/pre.inc.php
@@ -19,23 +19,20 @@
* $Source$
*
*/
+
+
require("../main.inc.php");
function llxHeader($head = "", $urlp = "")
{
- global $user, $conf;
+ global $user, $conf, $langs;
- /*
- *
- *
- */
top_menu($head);
$menu = new Menu();
- $menu->add(DOL_URL_ROOT."/comm/clients.php","Clients");
-
- $menu->add("index.php","Fiches d'intervention");
+ $menu->add(DOL_URL_ROOT."/comm/clients.php", $langs->trans("Customers"));
+ $menu->add("index.php", $langs->trans("Interventions"));
left_menu($menu->liste);
}
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 2e8d1629e0e..b66a7e03081 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -82,10 +82,16 @@ Module410Name=Webcalendar
Module410Desc=Webcalendar integration
Module700Name=Donations
Module700Desc=Donations' management
+Permission11=Read bills
+Permission12=Create/modify bills
+Permission14=Validate bills
+Permission15=Send bills by email
+Permission16=Create payments for bills
+Permission19=Delete bills
Permission21=Read commercial proposals
Permission22=Create/modify commercial proposals
Permission24=Validate commercial proposals
-Permission25=Send commercial proposals to customers
+Permission25=Send commercial proposals
Permission26=Close commercial proposals
Permission27=Delete commercial proposals
Permission31=Read products/services
@@ -99,6 +105,12 @@ Permission81=Read orders
Permission82=Create/modify orders
Permission84=Activate orders
Permission89=Disable orders
+Permission91=Lire les charges
+Permission92=Créer modifier les charges
+Permission93=Supprimer les charges
+Permission95=Lire CA, bilans, résultats
+Permission96=Paramétrer la ventilation
+Permission97=Ventiler les lignes de facture
Permission121=Read companies
Permission122=Create/modify companies
Permission129=Delete companies
diff --git a/htdocs/langs/en_US/interventions.lang b/htdocs/langs/en_US/interventions.lang
new file mode 100644
index 00000000000..cdefe74bd2c
--- /dev/null
+++ b/htdocs/langs/en_US/interventions.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - en_US - interventions
+Intervention=Intervention
+Interventions=Interventions
+AddIntervention=Add intervention
+ListOfInterventions=List of interventions
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index fb6faed911f..55f3512c91c 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -1,5 +1,8 @@
# Dolibarr language file - en_US - mails
-Mailing=Mailing
+Mailing=EMailing
+EMailing=EMailing
+Mailings=EMailings
+EMailings=EMailings
MailCard=Mailing card
MailTargets=Targets
MailRecipients=Recipients
@@ -13,18 +16,18 @@ MailTopic=Mail topic
MailText=Message
MailFile=Attach a file
MailMessage=Message
-NewMailing=New mailing
-EditMailing=Edit mailing
-DeleteMailing=Delete mailing
-DeleteAMailing=Delete a mailing
-PreviewMailing=Preview mailing
-PrepareMailing=Prepare mailing
-CreateMailing=Create mailing
+NewMailing=New emailing
+EditMailing=Edit emailing
+DeleteMailing=Delete emailing
+DeleteAMailing=Delete an emailing
+PreviewMailing=Preview emailing
+PrepareMailing=Prepare emailing
+CreateMailing=Create emailing
MailingDesc=This page allows you to send mailings to a group of people.
MailingResult=Sending mails result
-TestMailing=Test mailing
-ValidMailing=Valid mailing
-ApproveMailing=Approve mailing
+TestMailing=Test emailing
+ValidMailing=Valid emailing
+ApproveMailing=Approve emailing
MailingStatusDraft=Draft
MailingStatusValidated=Validated
MailingStatusApproved=Approved
@@ -44,11 +47,11 @@ MailingModuleDescDolibarrUsers=All Dolibarr users
MailingModuleDescMembersValidated=All validated members
RecipientSelectionModules=Active emailing modules for recipients selection
MailSelectedRecipients=Selected recipients
-MailingArea=Mailings area
-LastMailings=Last %s mailings
+MailingArea=EMailings area
+LastMailings=Last %s emailings
TargetsStatistics=Targets statistics
NbOfProspectsContacts=Unique contacts for all prospects
NbOfCustomersContacts=Unique contacts for all customers
MailNoChangePossible=Recipients for validated mailing can't be changed
-SendMailing=Send mailing
+SendMailing=Send emailing
MailingNeedCommand=For securities reason, sending a mailing can only be performed from command line. Ask your administrator to launch the following command to send the mailing to all recipients:
\ No newline at end of file
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index a9edcda125d..390ce95e7c8 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -82,10 +82,16 @@ Module410Name=Webcalendar
Module410Desc=Interfaçage avec le calendrier Webcalendar
Module700Name=Dons
Module700Desc=Gestion des dons
+Permission11=Lire les factures
+Permission12=Créer/modifier les factures
+Permission14=Valider les factures
+Permission15=Envoyer les factures par email
+Permission16=Emettre des paiements sur les factures
+Permission19=Supprimer les factures
Permission21=Lire les propositions commerciales
Permission22=Créer modifier les propositions commerciales
Permission24=Valider les propositions commerciales
-Permission25=Envoyer les propositions commerciales aux clients
+Permission25=Envoyer les propositions commerciales
Permission26=Clôturer les propositions commerciales
Permission27=Supprimer les propositions commerciales
Permission31=Lire les produits/services
@@ -99,6 +105,12 @@ Permission81=Lire les commandes
Permission82=Créer/modifier les commandes
Permission84=Activer les commandes
Permission89=Désactiver les commandes
+Permission91=Lire les charges
+Permission92=Créer modifier les charges
+Permission93=Supprimer les charges
+Permission95=Lire CA, bilans, résultats
+Permission96=Paramétrer la ventilation
+Permission97=Ventiler les lignes de facture
Permission121=Lire les societes
Permission122=Créer/modifier modifier les societes
Permission129=Supprimer les sociétés
diff --git a/htdocs/langs/fr_FR/interventions.lang b/htdocs/langs/fr_FR/interventions.lang
new file mode 100644
index 00000000000..4e546a7d4b7
--- /dev/null
+++ b/htdocs/langs/fr_FR/interventions.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - fr_FR - interventions
+Intervention=Intervention
+Interventions=Interventions
+AddIntervention=Ajouter intervention
+ListOfInterventions=Liste des interventions
diff --git a/htdocs/langs/fr_FR/mails.lang b/htdocs/langs/fr_FR/mails.lang
index e334ce1ab1d..c6f743988eb 100644
--- a/htdocs/langs/fr_FR/mails.lang
+++ b/htdocs/langs/fr_FR/mails.lang
@@ -1,5 +1,8 @@
# Dolibarr language file - fr_FR - mails
Mailing=Mailing
+EMailing=Mailing
+Mailings=Mailings
+EMailings=Mailings
MailCard=Fiche mailing
MailTargets=Destinataires
MailRecipients=Destinataires