From a4dd36d967da3f4b41ea2f6b78f736eaabc34b0b Mon Sep 17 00:00:00 2001 From: William Mead Date: Fri, 20 Oct 2023 14:59:04 +0200 Subject: [PATCH] NEW resource improvements - data structure (#26285) * NEW improved resource data structure * Added data structure v18-v19 migration * Added null as default * Revert "Added null as default" This reverts commit c17d144800bc0bd740db77490db8790fc4996f56. * Added null as default * Added contributor details * Renamed user_places to max_users * Update llx_resource.sql --------- Co-authored-by: William Mead Co-authored-by: Laurent Destailleur --- htdocs/install/mysql/migration/18.0.0-19.0.0.sql | 9 ++++++++- htdocs/install/mysql/tables/llx_resource.sql | 9 +++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/htdocs/install/mysql/migration/18.0.0-19.0.0.sql b/htdocs/install/mysql/migration/18.0.0-19.0.0.sql index 58c2cf6c1c6..b4409140c98 100644 --- a/htdocs/install/mysql/migration/18.0.0-19.0.0.sql +++ b/htdocs/install/mysql/migration/18.0.0-19.0.0.sql @@ -138,4 +138,11 @@ ALTER TABLE llx_prelevement_lignes ADD COLUMN fk_user integer NULL; ALTER TABLE llx_hrm_evaluationdet ADD COLUMN comment TEXT; - +ALTER TABLE llx_resource ADD COLUMN address varchar(255) DEFAULT NULL AFTER fk_code_type_resource; +ALTER TABLE llx_resource ADD COLUMN zip varchar(25) DEFAULT NULL AFTER address; +ALTER TABLE llx_resource ADD COLUMN town varchar(50) DEFAULT NULL AFTER zip; +ALTER TABLE llx_resource ADD COLUMN photo_filename varchar(255) DEFAULT NULL AFTER town; +ALTER TABLE llx_resource ADD COLUMN max_users integer DEFAULT NULL AFTER photo_filename; +ALTER TABLE llx_resource ADD COLUMN phone varchar(255) DEFAULT NULL AFTER user_places; +ALTER TABLE llx_resource ADD COLUMN email varchar(255) DEFAULT NULL AFTER phone; +ALTER TABLE llx_resource ADD COLUMN url varchar(255) DEFAULT NULL AFTER email; diff --git a/htdocs/install/mysql/tables/llx_resource.sql b/htdocs/install/mysql/tables/llx_resource.sql index 30bd2bcbbf3..8cda2a5f341 100644 --- a/htdocs/install/mysql/tables/llx_resource.sql +++ b/htdocs/install/mysql/tables/llx_resource.sql @@ -1,6 +1,7 @@ -- Module to manage resources into Dolibarr ERP/CRM -- Copyright (C) 2013 Jean-François Ferry -- Copyright (C) 2016 Gilles Poirier +-- Copyright (C) 2023 William Mead -- -- 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 @@ -23,6 +24,14 @@ CREATE TABLE llx_resource asset_number varchar(255), description text, fk_code_type_resource varchar(32), + address varchar(255) DEFAULT NULL, + zip varchar(25) DEFAULT NULL, + town varchar(50) DEFAULT NULL, + photo_filename varchar(255) DEFAULT NULL, + max_users integer DEFAULT NULL, + phone varchar(20) DEFAULT NULL, + email varchar(255) DEFAULT NULL, + url varchar(255) DEFAULT NULL, datec datetime DEFAULT NULL, date_valid datetime DEFAULT NULL, fk_user_author integer DEFAULT NULL,