diff --git a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql index de87c76bff3..d3bdc300ad4 100644 --- a/htdocs/install/mysql/migration/19.0.0-20.0.0.sql +++ b/htdocs/install/mysql/migration/19.0.0-20.0.0.sql @@ -31,6 +31,16 @@ -- To rebuild sequence for postgresql after insert, by forcing id autoincrement fields: -- -- VPGSQL8.2 SELECT dol_util_rebuild_sequences(); + +-- V19 forgotten + +ALTER TABLE llx_resource ADD COLUMN phone varchar(255) DEFAULT NULL AFTER max_users; +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; +ALTER TABLE llx_resource ADD COLUMN fk_state integer DEFAULT NULL AFTER fk_country; +ALTER TABLE llx_resource ADD INDEX idx_resource_fk_state (fk_state); + + -- Use unique keys for extrafields ALTER TABLE llx_actioncomm_extrafields DROP INDEX idx_actioncomm_extrafields; ALTER TABLE llx_actioncomm_extrafields ADD UNIQUE INDEX uk_actioncomm_extrafields (fk_object); diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php index b08d6a9b4df..36dc803936a 100644 --- a/htdocs/resource/class/dolresource.class.php +++ b/htdocs/resource/class/dolresource.class.php @@ -32,6 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonpeople.class.php'; class Dolresource extends CommonObject { use CommonPeople; + /** * @var string ID to identify managed object */ diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php index 24eb90e093d..e45886c9046 100644 --- a/htdocs/resource/list.php +++ b/htdocs/resource/list.php @@ -280,6 +280,8 @@ if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) { print "\n"; +$totalarray = array(); + if ($ret) { foreach ($object->lines as $resource) { print '