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

Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0

Browse Source 
Conflicts:
	htdocs/langs/en_US/banks.lang
	htdocs/stripe/class/stripe.class.php
This commit is contained in:
Laurent Destailleur 2021-01-24 15:24:56 +01:00
commit 7365974594
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
htdocs/compta/paiement/card.php
View File

@ -265,10 +265,8 @@ print '</td></tr>';
// Bank account // Bank account
if (!empty($conf->banque->enabled)) if (!empty($conf->banque->enabled))
{ {
if ($object->fk_account > 0) if ($object->fk_account > 0) {
{ if ($object->type_code == 'CHQ' && $bankline->fk_bordereau > 0) {
if ($object->type_code == 'CHQ' && $bankline->fk_bordereau > 0)
{
dol_include_once('/compta/paiement/cheque/class/remisecheque.class.php'); dol_include_once('/compta/paiement/cheque/class/remisecheque.class.php');
$bordereau = new RemiseCheque($db); $bordereau = new RemiseCheque($db);
$bordereau->fetch($bankline->fk_bordereau); $bordereau->fetch($bankline->fk_bordereau);
@ -285,7 +283,12 @@ if (!empty($conf->banque->enabled))
print '<tr>'; print '<tr>';
print '<td>'.$langs->trans('BankTransactionLine').'</td>'; print '<td>'.$langs->trans('BankTransactionLine').'</td>';
print '<td>'; print '<td>';
print $bankline->getNomUrl(1, 0, 'showconciliatedandaccounted'); if ($object->fk_account > 0) {
print $bankline->getNomUrl(1, 0, 'showconciliatedandaccounted');
} else {
$langs->load("admin");
print '<span class="opacitymedium">'.$langs->trans("NoRecordFoundIBankcAccount", $langs->transnoentitiesnoconv("Module85Name")).'</span>';
}
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
} }

1
htdocs/langs/en_US/banks.lang
View File

@ -180,3 +180,4 @@ BankColorizeMovementDesc=If this function is enable, you can choose specific bac
BankColorizeMovementName1=Background color for debit movement BankColorizeMovementName1=Background color for debit movement
BankColorizeMovementName2=Background color for credit movement BankColorizeMovementName2=Background color for credit movement
IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning. IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
NoRecordFoundIBankcAccount=No record found in bank account. Commonly, this occurs when a record has been deleted manually from the list of transaction in the bank account (for example during a reconciliation of the bank account). Another reason is that the payment was recorded when the module "%s" was disabled.

2
htdocs/stripe/class/stripe.class.php
View File

@ -430,7 +430,7 @@ class Stripe extends CommonObject
if ($off_session) if ($off_session)
{ {
unset($dataforintent['setup_future_usage']); unset($dataforintent['setup_future_usage']);
$dataforintent["off_session"] = true; $dataforintent["setup_future_usage"] = "off_session";
} }
if (!is_null($payment_method)) if (!is_null($payment_method))
{ {