Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix : uniformize RCUR instead of RECUR (#25536)

Browse Source
This commit is contained in:
Maxime Kohlhaas 2023-08-02 19:32:04 +02:00 committed by GitHub
parent fe7eed9197
commit b5d84cbb55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/prelevement/class/bonprelevement.class.php
View File

@ -966,7 +966,7 @@ class BonPrelevement extends CommonObject
if ($format == 'FRST' && $bac->frstrecur != 'FRST') {
continue;
}
if ($format == 'RCUR' && ($bac->frstrecur != 'RCUR' && $bac->frstrecur != 'RECUR')) {
if ($format == 'RCUR' && $bac->frstrecur != 'RCUR') {
continue;
}
}

2
htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
View File

@ -357,7 +357,7 @@ class pdf_sepamandate extends ModeleBankAccountDoc
$pdf->MultiCell($this->page_largeur - $this->marge_gauche - $this->marge_droite, 3, $txt, 0, 'L');
$pdf->Rect(80, $posY, 5, 5);
$pdf->SetXY(80, $posY);
if ($object->frstrecur == 'RECUR') {
if ($object->frstrecur == 'RCUR') {
$pdf->MultiCell(5, 3, 'X', 0, 'L');
}
$pdf->SetXY(86, $posY);

4
htdocs/install/mysql/migration/18.0.0-19.0.0.sql
View File

@ -36,4 +36,6 @@
-- V19
ALTER TABLE llx_ticket ADD COLUMN fk_contract integer DEFAULT 0 after fk_project;
UPDATE llx_product_lot SET manufacturing_date = datec WHERE manufacturing_date IS NULL
UPDATE llx_product_lot SET manufacturing_date = datec WHERE manufacturing_date IS NULL;
UPDATE llx_societe_rib SET frstrecur = 'RCUR' WHERE frstrecur = 'RECUR';

2
htdocs/societe/class/companybankaccount.class.php
View File

@ -49,7 +49,7 @@ class CompanyBankAccount extends Account
public $default_rib;
/**
* Value 'FRST' or 'RCUR' (For SEPA mandate). Warning, in database, we store 'RECUR'.
* Value 'FRST' or 'RCUR' (For SEPA mandate)
*
* @var string
*/

4
htdocs/societe/paymentmodes.php
View File

@ -1937,7 +1937,7 @@ if ($socid && $action == 'edit' && $permissiontoaddupdatepaymentinformation) {
print '<td>'.$form->selectDate($date_rum ? $date_rum : $companybankaccount->date_rum, 'date_rum', 0, 0, 1, 'date_rum', 1, 1).'</td></tr>';
print '<tr><td>'.$langs->trans("WithdrawMode").'</td><td>';
$tblArraychoice = array("FRST" => $langs->trans("FRST"), "RECUR" => $langs->trans("RECUR"));
$tblArraychoice = array("FRST" => $langs->trans("FRST"), "RCUR" => $langs->trans("RECUR"));
print $form->selectarray("frstrecur", $tblArraychoice, dol_escape_htmltag(GETPOST('frstrecur', 'alpha') ?GETPOST('frstrecur', 'alpha') : $companybankaccount->frstrecur), 0);
print '</td></tr>';
@ -2102,7 +2102,7 @@ if ($socid && $action == 'create' && $permissiontoaddupdatepaymentinformation) {
print '<td colspan="4">'.$form->selectDate($date_rum, 'date_rum', 0, 0, 1, 'date_rum', 1, 1).'</td></tr>';
print '<tr><td>'.$langs->trans("WithdrawMode").'</td><td>';
$tblArraychoice = array("FRST" => $langs->trans("FRST"), "RECUR" => $langs->trans("RECUR"));
$tblArraychoice = array("FRST" => $langs->trans("FRST"), "RCUR" => $langs->trans("RECUR"));
print $form->selectarray("frstrecur", $tblArraychoice, (GETPOSTISSET('frstrecur') ? GETPOST('frstrecur') : 'FRST'), 0);
print '</td></tr>';