Skip to content

Commit

Permalink
Merge pull request #32362 from hregis/fix_dev_missing_create_accounti…
Browse files Browse the repository at this point in the history 
…ng_dict

FIX prepare the possibility of having different payment methods per entity (eg RUM/SEPA)
  • Loading branch information
@eldy
eldy authored Dec 13, 2024
2 parents f817254 + 8c7ee64 commit 933b017
Show file tree
Hide file tree
Showing 3 changed files with 64 additions and 57 deletions.
5 changes: 5 additions & 0 deletions htdocs/install/mysql/migration/20.0.0-21.0.0.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -385,3 +385,8 @@ ALTER TABLE llx_facture_rec ADD COLUMN fk_societe_rib integer DEFAULT NULL;

ALTER TABLE llx_facture ADD COLUMN is_also_delivery_note tinyint DEFAULT 0 NOT NULL;
ALTER TABLE llx_user MODIFY COLUMN signature LONGTEXT;

-- Add entity field
ALTER TABLE llx_societe_rib DROP INDEX uk_societe_rib;
ALTER TABLE llx_societe_rib ADD COLUMN entity integer DEFAULT 1 NOT NULL AFTER rowid;
ALTER TABLE llx_societe_rib ADD UNIQUE INDEX uk_societe_rib(entity, label, fk_soc);
5 changes: 3 additions & 2 deletions htdocs/install/mysql/tables/llx_societe_rib.key.sql
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
-- ===================================================================
-- Copyright (C) 2016 Laurent Destailleur <eldy@users.sourceforge.net>
-- Copyright (C) 2016 Laurent Destailleur <eldy@users.sourceforge.net>
-- Copyright (C) 2024 Regis Houssin <regis.houssin@inodbox.com>
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
Expand All @@ -17,6 +18,6 @@
-- ===================================================================


ALTER TABLE llx_societe_rib ADD UNIQUE INDEX uk_societe_rib(label, fk_soc);
ALTER TABLE llx_societe_rib ADD UNIQUE INDEX uk_societe_rib(entity, label, fk_soc);

ALTER TABLE llx_societe_rib ADD CONSTRAINT llx_societe_rib_fk_societe FOREIGN KEY (fk_soc) REFERENCES llx_societe(rowid);
111 changes: 56 additions & 55 deletions htdocs/install/mysql/tables/llx_societe_rib.sql
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
-- =============================================================================
-- Copyright (C) 2000-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Copyright (C) 2005-2009 Regis Houssin <regis.houssin@inodbox.com>
-- Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es>
-- Copyright (C) 2013 Peter Fontaine <contact@peterfontaine.fr>
-- Copyright (C) 2023 Alexandre Spangaro <aspangaro@easya.solutions>
-- Copyright (C) 2000-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
-- Copyright (C) 2005-2024 Regis Houssin <regis.houssin@inodbox.com>
-- Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es>
-- Copyright (C) 2013 Peter Fontaine <contact@peterfontaine.fr>
-- Copyright (C) 2023 Alexandre Spangaro <aspangaro@easya.solutions>
--
-- This program is free software; you can redistribute it and/or modify
-- it under the terms of the GNU General Public License as published by
Expand All @@ -23,72 +23,73 @@

create table llx_societe_rib
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
type varchar(32) DEFAULT 'ban' NOT NULL, -- 'ban' or 'paypal' or 'card' or 'stripe'
label varchar(200),
fk_soc integer NOT NULL,
datec datetime,
tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
rowid integer AUTO_INCREMENT PRIMARY KEY,
entity integer DEFAULT 1 NOT NULL, -- multi company id
type varchar(32) DEFAULT 'ban' NOT NULL, -- 'ban' or 'paypal' or 'card' or 'stripe'
label varchar(200),
fk_soc integer NOT NULL,
datec datetime,
tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,

-- For BAN
bank varchar(255), -- bank name
code_banque varchar(128), -- bank code
code_guichet varchar(6), -- desk code
number varchar(255), -- account number
cle_rib varchar(5), -- key of bank account
bank varchar(255), -- bank name
code_banque varchar(128), -- bank code
code_guichet varchar(6), -- desk code
number varchar(255), -- account number
cle_rib varchar(5), -- key of bank account

bic varchar(20), -- 11 according to ISO 9362 (we keep 20 for backward compatibility)
bic_intermediate varchar(11), -- 11 according to ISO 9362. Same as bic but for intermediate bank
iban_prefix varchar(80), -- full iban. 34 according to ISO 13616 but we set 80 to allow to store it with encryption information
bic varchar(20), -- 11 according to ISO 9362 (we keep 20 for backward compatibility)
bic_intermediate varchar(11), -- 11 according to ISO 9362. Same as bic but for intermediate bank
iban_prefix varchar(80), -- full iban. 34 according to ISO 13616 but we set 80 to allow to store it with encryption information

domiciliation varchar(255),
proprio varchar(60),
owner_address varchar(255),
default_rib smallint NOT NULL DEFAULT 0,
state_id integer,
fk_country integer,
currency_code varchar(3),
domiciliation varchar(255),
proprio varchar(60),
owner_address varchar(255),
default_rib smallint NOT NULL DEFAULT 0,
state_id integer,
fk_country integer,
currency_code varchar(3),

model_pdf varchar(255), -- last template used to generate main document
last_main_doc varchar(255), -- relative filepath+filename of last main generated document
model_pdf varchar(255), -- last template used to generate main document
last_main_doc varchar(255), -- relative filepath+filename of last main generated document

-- For BAN direct debit feature
rum varchar(32), -- RUM value to use for SEPA generation
date_rum date, -- Date of mandate
frstrecur varchar(16) DEFAULT 'FRST', -- 'FRST' or 'RECUR'
rum varchar(32), -- RUM value to use for SEPA generation
date_rum date, -- Date of mandate
frstrecur varchar(16) DEFAULT 'FRST', -- 'FRST' or 'RECUR'

-- For credit card
last_four varchar(4), -- last 4
card_type varchar(255), -- card type 'VISA', 'MC' , ...
cvn varchar(255),
exp_date_month integer,
exp_date_year integer,
country_code varchar(10),
last_four varchar(4), -- last 4
card_type varchar(255), -- card type 'VISA', 'MC' , ...
cvn varchar(255),
exp_date_month integer,
exp_date_year integer,
country_code varchar(10),

-- For Paypal
approved integer DEFAULT 0,
email varchar(255),
ending_date date,
max_total_amount_of_all_payments double(24,8),
preapproval_key varchar(255),
starting_date date,
total_amount_of_all_payments double(24,8),
approved integer DEFAULT 0,
email varchar(255),
ending_date date,
max_total_amount_of_all_payments double(24,8),
preapproval_key varchar(255),
starting_date date,
total_amount_of_all_payments double(24,8),

--For Stripe, Stancer, ...
stripe_card_ref varchar(128), -- card_...'
stripe_account varchar(128), -- 'pk_live_...'
stripe_card_ref varchar(128), -- card_...'
stripe_account varchar(128), -- 'pk_live_...'

ext_payment_site varchar(128), -- name of external paymentmode (for example 'StripeLive')
ext_payment_site varchar(128), -- name of external paymentmode (for example 'StripeLive')

extraparams varchar(255), -- for other parameters with json format
extraparams varchar(255), -- for other parameters with json format

-- For Online Sign
date_signature datetime,
online_sign_ip varchar(48),
online_sign_name varchar(64),
date_signature datetime,
online_sign_ip varchar(48),
online_sign_name varchar(64),

comment varchar(255),
ipaddress varchar(68),
status integer NOT NULL DEFAULT 1, -- 1=ACTIVE, 0=IN_TRASH
import_key varchar(14) -- import key
comment varchar(255),
ipaddress varchar(68),
status integer NOT NULL DEFAULT 1, -- 1=ACTIVE, 0=IN_TRASH
import_key varchar(14) -- import key
)ENGINE=innodb;

0 comments on commit 933b017

Please sign in to comment.