diff --git a/htdocs/core/modules/expedition/methode_expedition_chrono.modules.php b/htdocs/core/modules/expedition/methode_expedition_chrono.modules.php index acebea53430..412545b3f6f 100644 --- a/htdocs/core/modules/expedition/methode_expedition_chrono.modules.php +++ b/htdocs/core/modules/expedition/methode_expedition_chrono.modules.php @@ -35,7 +35,7 @@ class methode_expedition_chrono extends ModeleShippingMethod { $this->db = $db; $this->id = 8; // Do not change this value - $this->code = "COLCHRONO"; // Do not change this value + $this->code = "CHRONO"; // Do not change this value $this->name = "Chronopost"; $this->description = "Chronopost"; } diff --git a/htdocs/core/modules/expedition/methode_expedition_gls.modules.php b/htdocs/core/modules/expedition/methode_expedition_gls.modules.php index 2f63ff927af..0fc67831a38 100644 --- a/htdocs/core/modules/expedition/methode_expedition_gls.modules.php +++ b/htdocs/core/modules/expedition/methode_expedition_gls.modules.php @@ -35,7 +35,7 @@ class methode_expedition_gls extends ModeleShippingMethod { $this->db = $db; $this->id = 7; // Do not change this value - $this->code = "COLGLS"; // Do not change this value + $this->code = "GLS"; // Do not change this value $this->name = "GLS"; $this->description = "General Logistics Systems"; } diff --git a/htdocs/core/modules/expedition/methode_expedition_kiala.modules.php b/htdocs/core/modules/expedition/methode_expedition_kiala.modules.php index fa8072ecda3..503bacdc421 100644 --- a/htdocs/core/modules/expedition/methode_expedition_kiala.modules.php +++ b/htdocs/core/modules/expedition/methode_expedition_kiala.modules.php @@ -35,7 +35,7 @@ Class methode_expedition_kiala extends ModeleShippingMethod { $this->db = $db; $this->id = 6; // Do not change this value - $this->code = "COLKIALA"; // Do not change this value + $this->code = "KIALA"; // Do not change this value $this->name = "KIALA"; $this->description = "KIALA"; } diff --git a/htdocs/core/modules/expedition/methode_expedition_ups.modules.php b/htdocs/core/modules/expedition/methode_expedition_ups.modules.php index 582f23c9e0a..1225b5d7959 100644 --- a/htdocs/core/modules/expedition/methode_expedition_ups.modules.php +++ b/htdocs/core/modules/expedition/methode_expedition_ups.modules.php @@ -34,7 +34,7 @@ class methode_expedition_ups extends ModeleShippingMethod { $this->db = $db; $this->id = 5; // Do not change this value - $this->code = "COLUPS"; // Do not change this value + $this->code = "UPS"; // Do not change this value $this->name = "UPS"; $this->description = "United Parcel Service"; } diff --git a/htdocs/install/mysql/data/llx_c_shipment_mode.sql b/htdocs/install/mysql/data/llx_c_shipment_mode.sql index ba625191e3d..3bb5a056ed2 100644 --- a/htdocs/install/mysql/data/llx_c_shipment_mode.sql +++ b/htdocs/install/mysql/data/llx_c_shipment_mode.sql @@ -33,7 +33,7 @@ INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES ( INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (2,'TRANS','Transporter','Generic transporter',1); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (3,'COLSUI','Colissimo Suivi','Colissimo Suivi',0); INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (4,'LETTREMAX','Lettre Max','Courrier Suivi et Lettre Max',0); -INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (5,'COLUPS','UPS','United Parcel Service',0); -INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (6,'COLKIALA','KIALA','Relais Kiala',0); -INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (7,'COLGLS','GLS','General Logistics Systems',0); -INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (8,'COLCHRONO','Chronopost','Chronopost',0); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (5,'UPS','UPS','United Parcel Service',0); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (6,'KIALA','KIALA','Relais Kiala',0); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (7,'GLS','GLS','General Logistics Systems',0); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (8,'CHRONO','Chronopost','Chronopost',0); diff --git a/htdocs/install/mysql/migration/3.3.0-3.4.0.sql b/htdocs/install/mysql/migration/3.3.0-3.4.0.sql index 00d50ad51d7..97f8bc60bac 100755 --- a/htdocs/install/mysql/migration/3.3.0-3.4.0.sql +++ b/htdocs/install/mysql/migration/3.3.0-3.4.0.sql @@ -46,7 +46,7 @@ alter table llx_commande CHANGE COLUMN fk_adresse_livraison fk_delivery_address alter table llx_don CHANGE COLUMN adresse address text; alter table llx_adherent CHANGE COLUMN adresse address text; -INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (5,'COLUPS','UPS','United Parcel Service',0); -INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (6,'COLKIALA','KIALA','Relais Kiala',0); -INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (7,'COLGLS','GLS','General Logistics Systems',0); -INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (8,'COLCHRONO','Chronopost','Chronopost',0); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (5,'UPS','UPS','United Parcel Service',0); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (6,'KIALA','KIALA','Relais Kiala',0); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (7,'GLS','GLS','General Logistics Systems',0); +INSERT INTO llx_c_shipment_mode (rowid,code,libelle,description,active) VALUES (8,'CHRONO','Chronopost','Chronopost',0);