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

Add missing column for the bank account for SEPA payments

Browse Source
This commit is contained in:
Laurent Destailleur 2023-02-27 15:02:01 +01:00
parent 3355867712
commit 14d6c5fbdb
3 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/compta/prelevement/card.php
View File

@ -210,8 +210,13 @@ if ($id > 0 || $ref) {
print '<div class="underbanner clearboth"></div>'; print '<div class="underbanner clearboth"></div>';
print '<table class="border centpercent tableforfield">'; print '<table class="border centpercent tableforfield">';
$acc = new Account($db); if ($object->fk_bank_account > 0) {
$result = $acc->fetch(($object->type == 'bank-transfer' ? $conf->global->PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT : $conf->global->PRELEVEMENT_ID_BANKACCOUNT)); $acc = new Account($db);
$result = $acc->fetch($object->fk_bank_account);
} else { // For backward compatibility
$acc = new Account($db);
$result = $acc->fetch(($object->type == 'bank-transfer' ? $conf->global->PAYMENTBYBANKTRANSFER_ID_BANKACCOUNT : $conf->global->PRELEVEMENT_ID_BANKACCOUNT));
}
print '<tr><td class="titlefieldcreate">'; print '<tr><td class="titlefieldcreate">';
$labelofbankfield = "BankToReceiveWithdraw"; $labelofbankfield = "BankToReceiveWithdraw";

1
htdocs/install/mysql/migration/17.0.0-18.0.0.sql
View File

@ -73,6 +73,7 @@ ALTER TABLE llx_bank_account ADD COLUMN owner_zip varchar(25);
ALTER TABLE llx_bank_account ADD COLUMN owner_town varchar(50); ALTER TABLE llx_bank_account ADD COLUMN owner_town varchar(50);
ALTER TABLE llx_bank_account ADD COLUMN owner_country_id integer DEFAULT NULL; ALTER TABLE llx_bank_account ADD COLUMN owner_country_id integer DEFAULT NULL;
ALTER TABLE llx_prelevement_bons ADD COLUMN fk_bank_account integer DEFAULT NULL;
ALTER TABLE llx_supplier_proposal ADD UNIQUE INDEX uk_supplier_proposal_ref (ref, entity); ALTER TABLE llx_supplier_proposal ADD UNIQUE INDEX uk_supplier_proposal_ref (ref, entity);

31
htdocs/install/mysql/tables/llx_prelevement_bons.sql
View File

@ -20,24 +20,25 @@
-- --
-- Direct debit or credit orders -- Direct debit or credit orders
-- --
-- statut 0 : draft
-- statut 1 : sent to the bank -- statut 1 : sent to the bank
-- statut 2 : paid -- statut 2 : paid
-- --
create table llx_prelevement_bons create table llx_prelevement_bons
( (
rowid integer AUTO_INCREMENT PRIMARY KEY, rowid integer AUTO_INCREMENT PRIMARY KEY,
type varchar(16) DEFAULT 'debit-order', -- 'debit-order' or 'bank-transfer' type varchar(16) DEFAULT 'debit-order', -- 'debit-order' or 'bank-transfer'
ref varchar(12), -- reference ref varchar(12), -- reference
entity integer DEFAULT 1 NOT NULL, -- multi company id entity integer DEFAULT 1 NOT NULL, -- multi company id
datec datetime, -- date de creation datec datetime, -- date de creation
amount double(24,8) DEFAULT 0, -- montant total du prelevement amount double(24,8) DEFAULT 0, -- montant total du prelevement
statut smallint DEFAULT 0, -- statut statut smallint DEFAULT 0, -- statut
credite smallint DEFAULT 0, -- indique si le prelevement a ete credite credite smallint DEFAULT 0, -- indique si le prelevement a ete credite
note text, note text,
date_trans datetime, -- date de transmission a la banque date_trans datetime, -- date de transmission a la banque
method_trans smallint, -- methode de transmission method_trans smallint, -- methode de transmission
fk_user_trans integer, -- user qui a effectue la transmission fk_user_trans integer, -- user qui a effectue la transmission
date_credit datetime, -- date de credit sur le compte date_credit datetime, -- date de credit sur le compte
fk_user_credit integer -- user qui a remonte l'info de credit fk_user_credit integer, -- user qui a remonte l'info de credit
fk_bank_account integer DEFAULT NULL
)ENGINE=innodb; )ENGINE=innodb;