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

NEW resource improvements - data structure #26285

Merged
merged 9 commits into from
Oct 20, 2023
Merged

NEW resource improvements - data structure #26285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a3c5bd7
NEW improved resource data structure
W1W1-M Oct 18, 2023
26d28c0
Added data structure v18-v19 migration
W1W1-M Oct 19, 2023
c17d144
Added null as default
W1W1-M Oct 20, 2023
7be4f8f
Revert "Added null as default"
W1W1-M Oct 20, 2023
90c6bfa
Added null as default
W1W1-M Oct 20, 2023
ea84821
Merge branch 'develop' into new-resource-improvements-2023v1-data-str…
W1W1-M Oct 20, 2023
296b380
Added contributor details
W1W1-M Oct 20, 2023
c9b93d6
Renamed user_places to max_users
W1W1-M Oct 20, 2023
0d15219
Update llx_resource.sql
eldy Oct 20, 2023
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
9 changes: 8 additions & 1 deletion htdocs/install/mysql/migration/18.0.0-19.0.0.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
9 changes: 9 additions & 0 deletions htdocs/install/mysql/tables/llx_resource.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
-- Module to manage resources into Dolibarr ERP/CRM
-- Copyright (C) 2013 Jean-François Ferry <jfefe@aternatik.fr>
-- Copyright (C) 2016 Gilles Poirier <glgpoirier@gmail.com>
-- Copyright (C) 2023 William Mead <william.mead@manchenumerique.fr>
--
-- 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,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,
Expand Down