diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php index 33a4409bac9..7ccac69b21a 100644 --- a/htdocs/compta/prelevement/card.php +++ b/htdocs/compta/prelevement/card.php @@ -210,8 +210,13 @@ if ($id > 0 || $ref) { print '
'; print '| '; $labelofbankfield = "BankToReceiveWithdraw"; diff --git a/htdocs/install/mysql/migration/17.0.0-18.0.0.sql b/htdocs/install/mysql/migration/17.0.0-18.0.0.sql index 1e5c82672cc..9c2643688dd 100644 --- a/htdocs/install/mysql/migration/17.0.0-18.0.0.sql +++ b/htdocs/install/mysql/migration/17.0.0-18.0.0.sql @@ -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_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); diff --git a/htdocs/install/mysql/tables/llx_prelevement_bons.sql b/htdocs/install/mysql/tables/llx_prelevement_bons.sql index fc7f3f2f538..086791db825 100644 --- a/htdocs/install/mysql/tables/llx_prelevement_bons.sql +++ b/htdocs/install/mysql/tables/llx_prelevement_bons.sql @@ -20,24 +20,25 @@ -- -- Direct debit or credit orders -- +-- statut 0 : draft -- statut 1 : sent to the bank -- statut 2 : paid -- create table llx_prelevement_bons ( - rowid integer AUTO_INCREMENT PRIMARY KEY, - type varchar(16) DEFAULT 'debit-order', -- 'debit-order' or 'bank-transfer' - ref varchar(12), -- reference - entity integer DEFAULT 1 NOT NULL, -- multi company id - datec datetime, -- date de creation - amount double(24,8) DEFAULT 0, -- montant total du prelevement - statut smallint DEFAULT 0, -- statut - credite smallint DEFAULT 0, -- indique si le prelevement a ete credite - note text, - date_trans datetime, -- date de transmission a la banque - method_trans smallint, -- methode de transmission - fk_user_trans integer, -- user qui a effectue la transmission - date_credit datetime, -- date de credit sur le compte - fk_user_credit integer -- user qui a remonte l'info de credit - + rowid integer AUTO_INCREMENT PRIMARY KEY, + type varchar(16) DEFAULT 'debit-order', -- 'debit-order' or 'bank-transfer' + ref varchar(12), -- reference + entity integer DEFAULT 1 NOT NULL, -- multi company id + datec datetime, -- date de creation + amount double(24,8) DEFAULT 0, -- montant total du prelevement + statut smallint DEFAULT 0, -- statut + credite smallint DEFAULT 0, -- indique si le prelevement a ete credite + note text, + date_trans datetime, -- date de transmission a la banque + method_trans smallint, -- methode de transmission + fk_user_trans integer, -- user qui a effectue la transmission + date_credit datetime, -- date de credit sur le compte + fk_user_credit integer, -- user qui a remonte l'info de credit + fk_bank_account integer DEFAULT NULL )ENGINE=innodb; |