Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

New: prepare for e-shipment (SQL part) #31773

Merged
merged 14 commits into from
Nov 12, 2024
Merged

New: prepare for e-shipment (SQL part) #31773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
887c62d
Add issue date
sonikf Nov 11, 2024
d153007
Add field fk_unit
sonikf Nov 11, 2024
ce2c756
Add shipment contacts
sonikf Nov 11, 2024
535aeb1
New Add is_delivery_note SQL part
sonikf Nov 11, 2024
b193742
New fields for e-shipment SQL part
sonikf Nov 11, 2024
2ec23a0
Merge branch 'develop' into sonikf-patch-e-shipment
sonikf Nov 11, 2024
e5a2cd7
Merge branch 'develop' into sonikf-patch-e-shipment
sonikf Nov 12, 2024
31f4007
Update llx_facture.sql
eldy Nov 12, 2024
f423ccf
Update 20.0.0-21.0.0.sql
eldy Nov 12, 2024
121f406
Update 20.0.0-21.0.0.sql
eldy Nov 12, 2024
ce73c44
Update llx_expedition.sql
eldy Nov 12, 2024
7084dc5
Merge branch 'develop' into sonikf-patch-e-shipment
eldy Nov 12, 2024
842a7d7
Merge branch 'develop' into sonikf-patch-e-shipment
eldy Nov 12, 2024
56dc58e
Merge branch 'develop' into sonikf-patch-e-shipment
eldy Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions htdocs/install/mysql/data/llx_c_type_contact.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@ insert into llx_c_type_contact (element, source, code, libelle, active ) values
insert into llx_c_type_contact (element, source, code, libelle, active ) values ('commande', 'external', 'CUSTOMER', 'Contact client suivi commande', 1);
insert into llx_c_type_contact (element, source, code, libelle, active ) values ('commande', 'external', 'SHIPPING', 'Contact client livraison commande', 1);

-- Shipment / Expedition
insert into llx_c_type_contact (element, source, code, libelle, active ) values ('expedition', 'external', 'SHIPPING', 'Loading facility', 1);
insert into llx_c_type_contact (element, source, code, libelle, active ) values ('expedition', 'external', 'SHIPPING', 'Delivery facility', 1);
insert into llx_c_type_contact (element, source, code, libelle, active ) values ('expedition', 'external', 'SHIPPING', 'Customer shipping contact', 1);

-- Intervention / Fichinter
insert into llx_c_type_contact (element, source, code, libelle, active ) values ('fichinter', 'internal', 'INTERREPFOLL', 'Responsable suivi de l''intervention', 1);
insert into llx_c_type_contact (element, source, code, libelle, active ) values ('fichinter', 'internal', 'INTERVENING', 'Intervenant', 1);
Expand Down
5 changes: 5 additions & 0 deletions htdocs/install/mysql/migration/20.0.0-21.0.0.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,4 +320,9 @@ ALTER TABLE llx_c_tva ADD COLUMN fk_department_buyer integer DEFAULT NULL AFTER
ALTER TABLE llx_c_tva ADD INDEX idx_tva_fk_department_buyer (fk_department_buyer);
ALTER TABLE llx_c_tva ADD CONSTRAINT fk_tva_fk_department_buyer FOREIGN KEY (fk_department_buyer) REFERENCES llx_c_departements (rowid);

ALTER TABLE llx_expeditiondet ADD COLUMN fk_unit integer AFTER qty;
INSERT INTO llx_c_type_contact (element, source, code, libelle, active ) values ('expedition', 'external', 'SHIPPING', 'Loading facility', 1);
INSERT INTO llx_c_type_contact (element, source, code, libelle, active ) values ('expedition', 'external', 'SHIPPING', 'Delivery facility', 1);
INSERT INTO llx_c_type_contact (element, source, code, libelle, active ) values ('expedition', 'external', 'SHIPPING', 'Customer shipping contact', 1);

ALTER TABLE llx_facture_rec ADD COLUMN fk_societe_rib integer DEFAULT NULL;
3 changes: 1 addition & 2 deletions htdocs/install/mysql/tables/llx_expedition.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,10 @@ create table llx_expedition
ref varchar(30) NOT NULL,
entity integer DEFAULT 1 NOT NULL, -- multi company id
fk_soc integer NOT NULL,
fk_projet integer DEFAULT NULL,
fk_projet integer DEFAULT NULL,

ref_ext varchar(255), -- reference into an external system (not used by dolibarr)
ref_customer varchar(255), -- customer number

date_creation datetime, -- date of creation
fk_user_author integer, -- author of creation
fk_user_modif integer, -- author of last change
Expand Down
13 changes: 7 additions & 6 deletions htdocs/install/mysql/tables/llx_expeditiondet.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,13 @@
create table llx_expeditiondet
(
rowid integer AUTO_INCREMENT PRIMARY KEY,
fk_expedition integer NOT NULL, -- ID of parent object
fk_element integer, -- ID of main source object
fk_elementdet integer, -- ID of line of source object (proposal, sale order)
fk_expedition integer NOT NULL, -- ID of parent object
fk_element integer, -- ID of main source object
fk_elementdet integer, -- ID of line of source object (proposal, sale order)
element_type varchar(50) DEFAULT 'commande' NOT NULL, -- Type of source object ('commande', ...)
fk_product integer, -- ID of product. If empy, you can retreive it using fk_element/element_type link
qty real, -- Quantity
fk_entrepot integer, -- Warehouse for departure of product
fk_product integer, -- ID of product. If empy, you can retreive it using fk_element/element_type link
qty real, -- Quantity
fk_unit integer, -- ID of unit code
fk_entrepot integer, -- Warehouse for departure of product
rang integer DEFAULT 0
)ENGINE=innodb;
Loading