lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Regis Houssin 2012-12-07 10:48:10 +01:00
commit 8ea3614a3c
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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.

4
htdocs/compta/prelevement/fiche.php
View File

@ -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')!='')
{

4
htdocs/core/tpl/login.tpl.php
View File

@ -166,7 +166,9 @@ if ($forgetpasslink || $helpcenterlink) {
}
if ($helpcenterlink) {
echo '<a style="color: #888888; font-size: 10px" href="'.DOL_URL_ROOT.'/support/index.php" target="_blank">';
$url=DOL_URL_ROOT.'/support/index.php';
if (! empty($conf->global->MAIN_HELPCENTER_LINKTOUSE)) $url=$conf->global->MAIN_HELPCENTER_LINKTOUSE;
echo '<a style="color: #888888; font-size: 10px" href="'.dol_escape_htmltag($url).'" target="_blank">';
if ($forgetpasslink) {
echo '&nbsp;-&nbsp;';
} else {

4
htdocs/langs/fr_FR/withdrawals.lang
View File

@ -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