Skip to content

Commit

Permalink
Merge branch 'donModelNumero' of github.com:Tetras-Libre/dolibarr int…
Browse files Browse the repository at this point in the history
…o sif-19-v2
  • Loading branch information
dbeniamine committed Jan 2, 2025
2 parents 1db3866 + fb1314a commit 266d910
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion htdocs/core/modules/dons/mod_don_terre.php
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,11 @@ public function __construct()
/**
* Returns the description of the numbering model
*
* @param Translate $langs Object langs
* @return string Texte descripif
*/
public function info($langs)
{
global $langs;
$langs->load("bills");
return $langs->trans('TerreNumRefModelDesc1', $this->prefixdon, $this->prefixcreditnote, $this->prefixdeposit);
}
Expand Down
2 changes: 1 addition & 1 deletion htdocs/public/payment/paymentok.php
Original file line number Diff line number Diff line change
Expand Up @@ -901,7 +901,6 @@
}
$hookmanager->executeHooks('getBankAccountForPayements', $parameters, $bankaccountid, $action);

$hookmanager->executeHooks('getBankAccountForPayements', $parameters, $bankaccountid, $action);
if ($bankaccountid > 0) {
$label = '(CustomerInvoicePayment)';
if ($object->type == Facture::TYPE_CREDIT_NOTE) {
Expand Down Expand Up @@ -1150,6 +1149,7 @@
$bankaccountid = $conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS;
}

$hookmanager->executeHooks('getBankAccountForPayements', $parameters, $bankaccountid, $action);
if ($bankaccountid > 0) {
$label = '(DonationPayment)';
$result = $paiement->addPaymentToBank($user, 'payment_donation', $label, $bankaccountid, '', '');
Expand Down

0 comments on commit 266d910

Please sign in to comment.