From 5daca35e791e74f25514f208549670ebb5b55966 Mon Sep 17 00:00:00 2001 From: Gauthier PC portable 024 Date: Mon, 9 May 2022 12:33:39 +0200 Subject: [PATCH] FIX : new tables loading system --- .../core/modules/modStockTransfer.class.php | 2 +- .../install/mysql/migration/15.0.0-16.0.0.sql | 84 ------------------- ...nsfer_stocktransfer-stocktransfer.key.sql} | 0 ...ktransfer_stocktransfer-stocktransfer.sql} | 0 ...ransfer_extrafields-stocktransfer.key.sql} | 0 ...ocktransfer_extrafields-stocktransfer.sql} | 0 ...r_stocktransferline-stocktransfer.key.sql} | 0 ...nsfer_stocktransferline-stocktransfer.sql} | 0 ...ferline_extrafields-stocktransfer.key.sql} | 0 ...ransferline_extrafields-stocktransfer.sql} | 0 10 files changed, 1 insertion(+), 85 deletions(-) rename htdocs/install/mysql/tables/{llx_stocktransfer_stocktransfer.key.sql => llx_stocktransfer_stocktransfer-stocktransfer.key.sql} (100%) rename htdocs/install/mysql/tables/{llx_stocktransfer_stocktransfer.sql => llx_stocktransfer_stocktransfer-stocktransfer.sql} (100%) rename htdocs/install/mysql/tables/{llx_stocktransfer_stocktransfer_extrafields.key.sql => llx_stocktransfer_stocktransfer_extrafields-stocktransfer.key.sql} (100%) rename htdocs/install/mysql/tables/{llx_stocktransfer_stocktransfer_extrafields.sql => llx_stocktransfer_stocktransfer_extrafields-stocktransfer.sql} (100%) rename htdocs/install/mysql/tables/{llx_stocktransfer_stocktransferline.key.sql => llx_stocktransfer_stocktransferline-stocktransfer.key.sql} (100%) rename htdocs/install/mysql/tables/{llx_stocktransfer_stocktransferline.sql => llx_stocktransfer_stocktransferline-stocktransfer.sql} (100%) rename htdocs/install/mysql/tables/{llx_stocktransfer_stocktransferline_extrafields.key.sql => llx_stocktransfer_stocktransferline_extrafields-stocktransfer.key.sql} (100%) rename htdocs/install/mysql/tables/{llx_stocktransfer_stocktransferline_extrafields.sql => llx_stocktransfer_stocktransferline_extrafields-stocktransfer.sql} (100%) diff --git a/htdocs/core/modules/modStockTransfer.class.php b/htdocs/core/modules/modStockTransfer.class.php index 5d11464d644..376cf9409f2 100644 --- a/htdocs/core/modules/modStockTransfer.class.php +++ b/htdocs/core/modules/modStockTransfer.class.php @@ -435,7 +435,7 @@ class modStockTransfer extends DolibarrModules { global $conf, $langs; - $result = $this->_load_tables('/stocktransfer/sql/'); + $result = $this->_load_tables('/install/mysql/tables/', 'stocktransfer'); if ($result < 0) return -1; // Do not activate module if error 'not allowed' returned when loading module SQL queries (the _load_table run sql with run_sql with the error allowed parameter set to 'default') // Create extrafields during init diff --git a/htdocs/install/mysql/migration/15.0.0-16.0.0.sql b/htdocs/install/mysql/migration/15.0.0-16.0.0.sql index 89b6ff838c4..e1a29588054 100644 --- a/htdocs/install/mysql/migration/15.0.0-16.0.0.sql +++ b/htdocs/install/mysql/migration/15.0.0-16.0.0.sql @@ -342,87 +342,3 @@ ALTER TABLE llx_c_partnership_type ADD COLUMN keyword varchar(128); ALTER TABLE llx_eventorganization_conferenceorboothattendee ADD COLUMN firstname varchar(100); ALTER TABLE llx_eventorganization_conferenceorboothattendee ADD COLUMN lastname varchar(100); ALTER TABLE llx_eventorganization_conferenceorboothattendee ADD COLUMN email_company varchar(128) after email; - --- Stock transfers module - -CREATE TABLE llx_stocktransfer_stocktransfer( - -- BEGIN MODULEBUILDER FIELDS - rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, - entity integer DEFAULT 1 NOT NULL, - ref varchar(128) DEFAULT '(PROV)' NOT NULL, - label varchar(255), - fk_soc integer, - fk_project integer, - fk_warehouse_source integer, - fk_warehouse_destination integer, - description text, - note_public text, - note_private text, - tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - date_creation datetime NOT NULL, - date_prevue_depart date DEFAULT NULL, - date_reelle_depart date DEFAULT NULL, - date_prevue_arrivee date DEFAULT NULL, - date_reelle_arrivee date DEFAULT NULL, - lead_time_for_warning integer DEFAULT NULL, - fk_user_creat integer NOT NULL, - fk_user_modif integer, - import_key varchar(14), - model_pdf varchar(255), - last_main_doc varchar(255), - status smallint NOT NULL, - fk_incoterms integer, -- for incoterms - location_incoterms varchar(255) - -- END MODULEBUILDER FIELDS -) ENGINE=innodb; - -ALTER TABLE llx_stocktransfer_stocktransfer ADD INDEX idx_stocktransfer_stocktransfer_rowid (rowid); -ALTER TABLE llx_stocktransfer_stocktransfer ADD INDEX idx_stocktransfer_stocktransfer_ref (ref); -ALTER TABLE llx_stocktransfer_stocktransfer ADD INDEX idx_stocktransfer_stocktransfer_fk_soc (fk_soc); -ALTER TABLE llx_stocktransfer_stocktransfer ADD INDEX idx_stocktransfer_stocktransfer_fk_project (fk_project); -ALTER TABLE llx_stocktransfer_stocktransfer ADD CONSTRAINT llx_stocktransfer_stocktransfer_fk_user_creat FOREIGN KEY (fk_user_creat) REFERENCES llx_user(rowid); -ALTER TABLE llx_stocktransfer_stocktransfer ADD INDEX idx_stocktransfer_stocktransfer_status (status); - -CREATE TABLE llx_stocktransfer_stocktransferline( - -- BEGIN MODULEBUILDER FIELDS - rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, - amount double DEFAULT NULL, - qty real, - fk_warehouse_source integer NOT NULL, - fk_warehouse_destination integer NOT NULL, - fk_stocktransfer integer NOT NULL, - fk_product integer NOT NULL, - batch varchar(128) DEFAULT NULL, -- Lot or serial number - pmp double, - rang integer DEFAULT 0, - fk_parent_line integer NULL - -- END MODULEBUILDER FIELDS -) ENGINE=innodb; - -ALTER TABLE llx_stocktransfer_stocktransferline ADD INDEX idx_stocktransfer_stocktransferline_rowid (rowid); - -create table llx_stocktransfer_stocktransfer_extrafields -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - fk_object integer NOT NULL, - import_key varchar(14) -- import key -) ENGINE=innodb; - -ALTER TABLE llx_stocktransfer_stocktransfer_extrafields ADD INDEX idx_fk_object(fk_object); - -create table llx_stocktransfer_stocktransferline_extrafields -( - rowid integer AUTO_INCREMENT PRIMARY KEY, - tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, - fk_object integer NOT NULL, - import_key varchar(14) -- import key -) ENGINE=innodb; - -ALTER TABLE llx_stocktransfer_stocktransferline_extrafields ADD INDEX idx_fk_object(fk_object); - -ALTER TABLE llx_stock_mouvement CHANGE origintype origintype VARCHAR(64) - --- End Stock transfers module - - diff --git a/htdocs/install/mysql/tables/llx_stocktransfer_stocktransfer.key.sql b/htdocs/install/mysql/tables/llx_stocktransfer_stocktransfer-stocktransfer.key.sql similarity index 100% rename from htdocs/install/mysql/tables/llx_stocktransfer_stocktransfer.key.sql rename to htdocs/install/mysql/tables/llx_stocktransfer_stocktransfer-stocktransfer.key.sql diff --git a/htdocs/install/mysql/tables/llx_stocktransfer_stocktransfer.sql b/htdocs/install/mysql/tables/llx_stocktransfer_stocktransfer-stocktransfer.sql similarity index 100% rename from htdocs/install/mysql/tables/llx_stocktransfer_stocktransfer.sql rename to htdocs/install/mysql/tables/llx_stocktransfer_stocktransfer-stocktransfer.sql diff --git a/htdocs/install/mysql/tables/llx_stocktransfer_stocktransfer_extrafields.key.sql b/htdocs/install/mysql/tables/llx_stocktransfer_stocktransfer_extrafields-stocktransfer.key.sql similarity index 100% rename from htdocs/install/mysql/tables/llx_stocktransfer_stocktransfer_extrafields.key.sql rename to htdocs/install/mysql/tables/llx_stocktransfer_stocktransfer_extrafields-stocktransfer.key.sql diff --git a/htdocs/install/mysql/tables/llx_stocktransfer_stocktransfer_extrafields.sql b/htdocs/install/mysql/tables/llx_stocktransfer_stocktransfer_extrafields-stocktransfer.sql similarity index 100% rename from htdocs/install/mysql/tables/llx_stocktransfer_stocktransfer_extrafields.sql rename to htdocs/install/mysql/tables/llx_stocktransfer_stocktransfer_extrafields-stocktransfer.sql diff --git a/htdocs/install/mysql/tables/llx_stocktransfer_stocktransferline.key.sql b/htdocs/install/mysql/tables/llx_stocktransfer_stocktransferline-stocktransfer.key.sql similarity index 100% rename from htdocs/install/mysql/tables/llx_stocktransfer_stocktransferline.key.sql rename to htdocs/install/mysql/tables/llx_stocktransfer_stocktransferline-stocktransfer.key.sql diff --git a/htdocs/install/mysql/tables/llx_stocktransfer_stocktransferline.sql b/htdocs/install/mysql/tables/llx_stocktransfer_stocktransferline-stocktransfer.sql similarity index 100% rename from htdocs/install/mysql/tables/llx_stocktransfer_stocktransferline.sql rename to htdocs/install/mysql/tables/llx_stocktransfer_stocktransferline-stocktransfer.sql diff --git a/htdocs/install/mysql/tables/llx_stocktransfer_stocktransferline_extrafields.key.sql b/htdocs/install/mysql/tables/llx_stocktransfer_stocktransferline_extrafields-stocktransfer.key.sql similarity index 100% rename from htdocs/install/mysql/tables/llx_stocktransfer_stocktransferline_extrafields.key.sql rename to htdocs/install/mysql/tables/llx_stocktransfer_stocktransferline_extrafields-stocktransfer.key.sql diff --git a/htdocs/install/mysql/tables/llx_stocktransfer_stocktransferline_extrafields.sql b/htdocs/install/mysql/tables/llx_stocktransfer_stocktransferline_extrafields-stocktransfer.sql similarity index 100% rename from htdocs/install/mysql/tables/llx_stocktransfer_stocktransferline_extrafields.sql rename to htdocs/install/mysql/tables/llx_stocktransfer_stocktransferline_extrafields-stocktransfer.sql