From c6a3add952ebe4234fccb4c090efa262109c0c15 Mon Sep 17 00:00:00 2001 From: Grand Philippe Date: Thu, 6 Dec 2012 17:09:12 +0100 Subject: [PATCH 1/2] fix : typo --- htdocs/compta/prelevement/fiche.php | 4 ++-- htdocs/langs/fr_FR/withdrawals.lang | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/compta/prelevement/fiche.php b/htdocs/compta/prelevement/fiche.php index 73450228480..9bfe97a4737 100644 --- a/htdocs/compta/prelevement/fiche.php +++ b/htdocs/compta/prelevement/fiche.php @@ -130,7 +130,7 @@ if ($action == 'infocredit' && $user->rights->prelevement->bons->credit) $bon = new BonPrelevement($db,""); $form = new Form($db); -llxHeader('',$langs->trans("WithdrawalReceipt")); +llxHeader('',$langs->trans("WithdrawalReceipts")); if ($id > 0) @@ -138,7 +138,7 @@ if ($id > 0) $bon->fetch($id); $head = prelevement_prepare_head($bon); - dol_fiche_head($head, 'prelevement', $langs->trans("WithdrawalReceipt"), '', 'payment'); + dol_fiche_head($head, 'prelevement', $langs->trans("WithdrawalReceipts"), '', 'payment'); if (GETPOST('error','alpha')!='') { diff --git a/htdocs/langs/fr_FR/withdrawals.lang b/htdocs/langs/fr_FR/withdrawals.lang index 27c00e307cf..2654bab69a9 100644 --- a/htdocs/langs/fr_FR/withdrawals.lang +++ b/htdocs/langs/fr_FR/withdrawals.lang @@ -10,7 +10,7 @@ StandingOrderProcessed=Traités Withdrawals=Retraits Withdrawal=Retrait WithdrawalsReceipts=Bons de prélèvements -WithdrawalReceipt=Bon de prélèvement +WithdrawalReceipts=Bon de prélèvements WithdrawalReceiptShort=Bon LastWithdrawalReceipts=Les %s derniers bons de traitement WithdrawedBills=Factures prélevées @@ -82,7 +82,7 @@ ShowWithdraw=Voir prélèvement IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Toutefois, si la facture a au moins un paiement par prélèvement non traité, elle ne le sera pas afin de permettre la gestion du prélèvement d'abord. DoStandingOrdersBeforePayments=Cet onglet permet de faire une demande de prélèvement bancaire. Une fois réalisé, vous pourrez saisir le paiement sur la facture pour la clore. WithdrawalFile=Fichier de prélèvement -SetToStatusSent=Mettre status "Fichier envoyé" +SetToStatusSent=Mettre statut "Fichier envoyé" ThisWillAlsoAddPaymentOnInvoice=Ceci créera également les paiements sur les factures et les classera payées ### Notifications From 3858085a7fdee25e07132bc70a4c0c6e1b2272c8 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 6 Dec 2012 17:59:37 +0100 Subject: [PATCH 2/2] Add option MAIN_HELPCENTER_LINKTOUSE to define target link "I need help" onto logon page. --- ChangeLog | 7 ++++--- htdocs/core/tpl/login.tpl.php | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 53062d29a18..dae68c53c11 100644 --- a/ChangeLog +++ b/ChangeLog @@ -62,9 +62,10 @@ For users: - New: Can choose menu entry to show with external site module. - New: Add hidden option MAIN_PDF_MARGIN_LEFT, MAIN_PDF_MARGIN_RIGHT, MAIN_PDF_MARGIN_TOP, MAIN_PDF_MARGIN_BOTTOM to force margins of generated PDF. -- New: [ task #314 ] Can define if prof id are mandatory or not -- New: Add button on order card to create intervention from services -- New: Add search box to find products by supplier reference +- New: [ task #314 ] Can define if prof id are mandatory or not. +- New: Add button on order card to create intervention from services. +- New: Add search box to find products by supplier reference. +- New: Add option MAIN_HELPCENTER_LINKTOUSE to define target link "I need help" onto logon page. New experimental modules: - New: Add margin management module. diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php index 81d446281ae..0597896a07b 100644 --- a/htdocs/core/tpl/login.tpl.php +++ b/htdocs/core/tpl/login.tpl.php @@ -166,7 +166,9 @@ if ($forgetpasslink || $helpcenterlink) { } if ($helpcenterlink) { - echo ''; + $url=DOL_URL_ROOT.'/support/index.php'; + if (! empty($conf->global->MAIN_HELPCENTER_LINKTOUSE)) $url=$conf->global->MAIN_HELPCENTER_LINKTOUSE; + echo ''; if ($forgetpasslink) { echo ' - '; } else {