diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php index ece8bcf5cd7..61ef0da1314 100644 --- a/htdocs/adherents/card_subscriptions.php +++ b/htdocs/adherents/card_subscriptions.php @@ -978,10 +978,10 @@ if ($rowid) $helpcontent=''; $helpcontent.=''.$langs->trans("MailFrom").': '.$conf->global->ADHERENT_MAIL_FROM.'
'."\n"; $helpcontent.=''.$langs->trans("MailRecipient").': '.$object->email.'
'."\n"; - $helpcontent.=''.$langs->trans("Subject").':
'."\n"; + $helpcontent.=''.$langs->trans("MailTopic").':
'."\n"; $helpcontent.=$subjecttosend."\n"; $helpcontent.="
"; - $helpcontent.=''.$langs->trans("Content").':
'; + $helpcontent.=''.$langs->trans("MailText").':
'; $helpcontent.=dol_htmlentitiesbr($texttosend)."\n"; print $form->textwithpicto($tmp,$helpcontent,1,'help'); diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php index 36c57926c4d..1a00c229150 100644 --- a/htdocs/admin/commande.php +++ b/htdocs/admin/commande.php @@ -472,7 +472,7 @@ foreach ($dirmodels as $reldir) $htmltooltip.='
'.$langs->trans("PaymentMode").': '.yn($module->option_modereg,1,1); $htmltooltip.='
'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg,1,1); $htmltooltip.='
'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang,1,1); - //$htmltooltip.='
'.$langs->trans("Escompte").': '.yn($module->option_escompte,1,1); + //$htmltooltip.='
'.$langs->trans("Discounts").': '.yn($module->option_escompte,1,1); //$htmltooltip.='
'.$langs->trans("CreditNote").': '.yn($module->option_credit_note,1,1); $htmltooltip.='
'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark,1,1); diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php index 6e54456f59e..46c793e0d72 100644 --- a/htdocs/admin/facture.php +++ b/htdocs/admin/facture.php @@ -571,7 +571,7 @@ foreach ($dirmodels as $reldir) $htmltooltip.='
'.$langs->trans("Logo").': '.yn($module->option_logo,1,1); $htmltooltip.='
'.$langs->trans("PaymentMode").': '.yn($module->option_modereg,1,1); $htmltooltip.='
'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg,1,1); - $htmltooltip.='
'.$langs->trans("Escompte").': '.yn($module->option_escompte,1,1); + $htmltooltip.='
'.$langs->trans("Discounts").': '.yn($module->option_escompte,1,1); $htmltooltip.='
'.$langs->trans("CreditNote").': '.yn($module->option_credit_note,1,1); $htmltooltip.='
'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang,1,1); $htmltooltip.='
'.$langs->trans("WatermarkOnDraftInvoices").': '.yn($module->option_draft_watermark,1,1); diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php index 02b57e63cb2..a0ed2dcba75 100644 --- a/htdocs/admin/propal.php +++ b/htdocs/admin/propal.php @@ -456,7 +456,7 @@ foreach ($dirmodels as $reldir) $htmltooltip.='
'.$langs->trans("PaymentMode").': '.yn($module->option_modereg,1,1); $htmltooltip.='
'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg,1,1); $htmltooltip.='
'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang,1,1); - //$htmltooltip.='
'.$langs->trans("Escompte").': '.yn($module->option_escompte,1,1); + //$htmltooltip.='
'.$langs->trans("Discounts").': '.yn($module->option_escompte,1,1); //$htmltooltip.='
'.$langs->trans("CreditNote").': '.yn($module->option_credit_note,1,1); $htmltooltip.='
'.$langs->trans("WatermarkOnDraftProposal").': '.yn($module->option_draft_watermark,1,1); diff --git a/htdocs/core/modules/dons/html_cerfafr.html b/htdocs/core/modules/dons/html_cerfafr.html index 246c31fc1c7..664bf54d965 100644 --- a/htdocs/core/modules/dons/html_cerfafr.html +++ b/htdocs/core/modules/dons/html_cerfafr.html @@ -123,8 +123,8 @@ - __DonationPaymentDate__ : __DATE__
- __DonationPaymentMode__ : __PAYMENTMODE_LIB__
+ __DatePayment__ : __DATE__
+ __PaymentMode__ : __PAYMENTMODE_LIB__
diff --git a/htdocs/core/modules/dons/html_cerfafr.modules.php b/htdocs/core/modules/dons/html_cerfafr.modules.php index e2f979b06ac..8c96087c38d 100644 --- a/htdocs/core/modules/dons/html_cerfafr.modules.php +++ b/htdocs/core/modules/dons/html_cerfafr.modules.php @@ -140,8 +140,8 @@ class html_cerfafr extends ModeleDon $form = str_replace('__DonationRef__',$outputlangs->trans("DonationRef"),$form); $form = str_replace('__DonationReceipt__',$outputlangs->trans("DonationReceipt"),$form); $form = str_replace('__DonationRecipient__',$outputlangs->trans("DonationRecipient"),$form); - $form = str_replace('__DonationPaymentDate__',$outputlangs->trans("DonationPaymentDate"),$form); - $form = str_replace('__DonationPaymentMode__',$outputlangs->trans("DonationPaymentMode"),$form); + $form = str_replace('__DatePayment__',$outputlangs->trans("DatePayment"),$form); + $form = str_replace('__PaymentMode__',$outputlangs->trans("PaymentMode"),$form); $form = str_replace('__Name__',$outputlangs->trans("Name"),$form); $form = str_replace('__Address__',$outputlangs->trans("Address"),$form); $form = str_replace('__Zip__',$outputlangs->trans("Zip"),$form); diff --git a/htdocs/langs/en_US/donations.lang b/htdocs/langs/en_US/donations.lang index 0618c99e695..0c32ae3c055 100644 --- a/htdocs/langs/en_US/donations.lang +++ b/htdocs/langs/en_US/donations.lang @@ -27,8 +27,6 @@ BuildDonationReceipt=Build receipt DonationsModels=Documents models for donation receipts LastModifiedDonations=Last %s modified donations SearchADonation=Search a donation -DonationPaymentDate=Donation payment date -DonationPaymentMode=Donation payment mode DonationRecipient=Donation recipient ThankYou=Thank You IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount \ No newline at end of file diff --git a/htdocs/langs/fr_FR/donations.lang b/htdocs/langs/fr_FR/donations.lang index 1e270d17f0b..76a6452411b 100644 --- a/htdocs/langs/fr_FR/donations.lang +++ b/htdocs/langs/fr_FR/donations.lang @@ -27,8 +27,6 @@ BuildDonationReceipt=Créer reçu DonationsModels=Modèle de document de bon de réception de dons LastModifiedDonations=Les %s derniers dons modifiés SearchADonation=Rechercher un don -DonationPaymentDate=Date du versement -DonationPaymentMode=Mode de versement DonationRecipient=Bénéficiaire des versements ThankYou=Merci IConfirmDonationReception=Le bénéficiaire reconnait avoir reçu au titre des versements ouvrant droit à réduction d'impôt, la somme de \ No newline at end of file