Merge branch '10.0/bugfixes' of https://github.com/Lainow/glpi into 1…

…0.0/bugfixes

README.md

@@ -9,18 +9,39 @@
 
 GLPI stands for **Gestionnaire Libre de Parc Informatique** is a Free Asset and IT Management Software package, that provides ITIL Service Desk features, licenses tracking and software auditing.
 
-GLPI features:
-* Inventory of computers, peripherals, network printers and any associated components through an interface, with inventory tools such as: [FusionInventory](http://fusioninventory.org/) or [OCS Inventory](https://www.ocsinventory-ng.org/)
-* Data Center Infrastructure Management (DCIM)
-* Item lifecycle management
-* Licenses management (ITIL compliant)
-* Management of warranty and financial information (purchase order, warranty and extension, damping)
-* Management of contracts, contacts, documents related to inventory items
-* Incidents, requests, problems and changes management
-* Knowledge base and Frequently-Asked Questions (FAQ)
-* Asset reservation
-
-Moreover, GLPI supports many [plugins](http://plugins.glpi-project.org) that provide additional features.
+Major GLPI Features:
+
+* **Service Asset and Configuration Management (SACM)**: Manages your IT assets and configurations, tracks computers, peripherals, network printers, and their associated components. With native dynamic inventory management from version 10 onwards, you can maintain an up-to-date configuration database, ensuring accurate and timely information about your assets.
+
+* **Request Fulfillment**: Streamlines request fulfillment processes, making it easy to manage service requests, incidents, and problems efficiently. This ensures that user requests are handled promptly and professionally, enhancing overall service quality.
+
+* **Incident and Problem Management**: Supports efficient handling of ITIL's Incident Management and Problem Management processes. Ensures that issues are addressed promptly, root causes are identified, and preventive measures are taken.
+
+* **Change Management**: Supports change management processes, enabling you to plan, review, and implement changes in a controlled and standardized manner. This helps minimize disruptions and risks associated with changes to your IT environment.
+
+* **Knowledge Management**: Includes a knowledge base and Frequently Asked Questions (FAQ) support, facilitating knowledge management. Allows you to capture, store, and share valuable information and solutions, empowering your team to resolve issues more effectively.
+
+* **Contract Management**: Offers comprehensive contract management capabilities, including managing contracts, contacts, and associated documents related to inventory items. Aligns with ITIL's Supplier Management process, ensuring you have control and visibility over your contracts and vendor relationships.
+
+* **Financial Management for IT Services**: Assists in managing financial information, such as purchase orders, warranty details, and depreciation. Aligns with ITIL's Financial Management for IT Services process, helping you optimize IT spending and investments.
+
+* **Asset Reservation**: Offers asset reservation functionality, allowing you to reserve IT assets for specific purposes or periods. Aligns with ITIL's Demand Management process, ensuring resources are allocated effectively based on demand.
+
+* **Data Center Infrastructure Management (DCIM)**: Provides features for managing data center infrastructure, enhancing control over critical assets.
+
+* **Software and License Management**: Includes functionality for managing software and licenses, ensuring compliance and cost control.
+
+* **Impact Analysis**: Supports impact analysis, helping assess the potential consequences of changes or incidents on IT services.
+
+* **Service Catalog (with SLM)**: Includes service catalog features, often linked with Service Level Management (SLM), to define and manage available services.
+
+* **Entity Separation**: Offers entity separation features, allowing distinct management of different organizational units or entities.
+
+* **Project Management**: Supports project management, helping organize and track projects and associated tasks.
+
+* **Intervention Planning**: Offers intervention planning capabilities for scheduling and managing on-site interventions.
+
+Moreover, supports many [plugins](http://plugins.glpi-project.org) that provide additional features.
 
 ## Demonstration
 

css/includes/components/_richtext.scss

@@ -55,6 +55,7 @@ body.mce-content-body {
 
 .rich_text_container {
     white-space: initial;
+    width: 100%;
 
     thead,
     tbody,
@@ -70,6 +71,8 @@ body.mce-content-body {
     }
 
     table {
+        overflow: auto;
+        max-width: 100%;
         word-break: normal;
     }
 

install/migrations/update_10.0.10_to_10.0.11/lockedfield.php

@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * ---------------------------------------------------------------------
+ *
+ * GLPI - Gestionnaire Libre de Parc Informatique
+ *
+ * http://glpi-project.org
+ *
+ * @copyright 2015-2023 Teclib' and contributors.
+ * @copyright 2003-2014 by the INDEPNET Development Team.
+ * @licence   https://www.gnu.org/licenses/gpl-3.0.html
+ *
+ * ---------------------------------------------------------------------
+ *
+ * LICENSE
+ *
+ * This file is part of GLPI.
+ *
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * ---------------------------------------------------------------------
+ */
+
+//lockedfield previous value must be null for global lock
+$migration->addPostQuery(
+    $DB->buildUpdate(
+        'glpi_lockedfields',
+        [
+            'value' => null
+        ],
+        [
+            'is_global' => 1
+        ]
+    )
+);

install/migrations/update_10.0.10_to_10.0.11/transfer.php

@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * ---------------------------------------------------------------------
+ *
+ * GLPI - Gestionnaire Libre de Parc Informatique
+ *
+ * http://glpi-project.org
+ *
+ * @copyright 2015-2023 Teclib' and contributors.
+ * @copyright 2003-2014 by the INDEPNET Development Team.
+ * @licence   https://www.gnu.org/licenses/gpl-3.0.html
+ *
+ * ---------------------------------------------------------------------
+ *
+ * LICENSE
+ *
+ * This file is part of GLPI.
+ *
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * ---------------------------------------------------------------------
+ */
+
+/**
+ * @var DB $DB
+ * @var Migration $migration
+ */
+
+
+$migration->addField('glpi_transfers', 'keep_location', "int", ['value' => '1']);

install/mysql/glpi-empty.sql

@@ -7514,6 +7514,7 @@ CREATE TABLE `glpi_transfers` (
   `keep_certificate` int NOT NULL DEFAULT '0',
   `clean_certificate` int NOT NULL DEFAULT '0',
   `lock_updated_fields` int NOT NULL DEFAULT '0',
+  `keep_location` int NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
   KEY `name` (`name`),
   KEY `date_mod` (`date_mod`),