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

Fix regression

Browse Source
This commit is contained in:
Laurent Destailleur 2020-10-09 11:49:45 +02:00
parent b6fc33c454
commit 4eaf2c0350
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/bank/bankentries_list.php
View File

@ -213,7 +213,7 @@ if (empty($reshook))
// Conciliation // Conciliation
if ((GETPOST('confirm_savestatement', 'alpha') || GETPOST('confirm_reconcile', 'alpha')) && $user->rights->banque->consolidate if ((GETPOST('confirm_savestatement', 'alpha') || GETPOST('confirm_reconcile', 'alpha')) && $user->rights->banque->consolidate
&& (GETPOST('pageplusone') == GETPOST('pageplusoneold'))) && (!GETPOSTISSET('pageplusoneold') || (GETPOST('pageplusone') == GETPOST('pageplusoneold'))))
{ {
$error = 0; $error = 0;

4
htdocs/compta/tva/card.php
View File

@ -98,7 +98,7 @@ if ($action == 'add' && $_POST["cancel"] <> $langs->trans("Cancel"))
} }
$object->amount = $amount; $object->amount = $amount;
$object->label = GETPOST("label", 'alpha'); $object->label = GETPOST("label", 'alpha');
$object->note = GETPOST("note", 'restricthtml'); $object->note_private = GETPOST("note", 'restricthtml');
if (empty($object->datep)) if (empty($object->datep))
{ {
@ -239,7 +239,7 @@ if ($action == 'create')
print '<label for="radiorefund">'; print '<label for="radiorefund">';
print '<input type="radio" id="radiorefund" data-label="'.$langs->trans('VATRefund').'" class="flat" name="refund" value="1"'.($refund ? ' checked="checked"' : '').'>'; print '<input type="radio" id="radiorefund" data-label="'.$langs->trans('VATRefund').'" class="flat" name="refund" value="1"'.($refund ? ' checked="checked"' : '').'>';
print '&nbsp;'; print '&nbsp;';
print $langs->trans("Refund"); print $langs->trans("PaymentBack");
print '</label>'; print '</label>';
print '</div>'; print '</div>';
print "<br>\n"; print "<br>\n";

2
htdocs/langs/fr_FR/bills.lang
View File

@ -58,7 +58,7 @@ SuppliersInvoices=Factures fournisseurs
SupplierBill=Facture fournisseur SupplierBill=Facture fournisseur
SupplierBills=Factures fournisseurs SupplierBills=Factures fournisseurs
Payment=Règlement Payment=Règlement
PaymentBack=Rembourser PaymentBack=Remboursement
CustomerInvoicePaymentBack=Rembourser CustomerInvoicePaymentBack=Rembourser
Payments=Règlements Payments=Règlements
PaymentsBack=Remboursements PaymentsBack=Remboursements