Merge branch 'release/2.7.3'

pluginsGLPI · Oct 28, 2021 · 9552b0c · 9552b0c
2 parents 274f364 + ccc162b
commit 9552b0c
Show file tree

Hide file tree

Showing 24 changed files with 12,161 additions and 12,192 deletions.
diff --git a/composer.json b/composer.json
@@ -4,7 +4,7 @@
         "masnathan/odtphp": "dev-teclib"
     },
     "require-dev": {
-        "glpi-project/tools": "^0.2"
+        "glpi-project/tools": "^0.3"
     },
     "config": {
         "optimize-autoloader": true,

diff --git a/composer.lock b/composer.lock
diff --git a/inc/order.class.php b/inc/order.class.php
@@ -2437,7 +2437,7 @@ public static function install(Migration $migration) {
                `plugin_order_accountsections_id` int(11) NOT NULL default '0' COMMENT 'RELATION to plugin_order_accountsections (id)',
                `locations_id` int(11) NOT NULL default '0' COMMENT 'RELATION to glpi_locations (id)',
                `plugin_order_orderstates_id` int(11) NOT NULL default 1,
-               `plugin_order_billstates_id` int(11) NOT NULL default 1,
+               `plugin_order_billstates_id` int(11) NOT NULL default 0,
                `port_price` float NOT NULL default 0,
                `global_discount` float NOT NULL default 0,
                `comment` text collate utf8_unicode_ci,
@@ -2696,6 +2696,9 @@ public static function install(Migration $migration) {
 
          //2.7.0
          $migration->addField($table, "global_discount", "FLOAT NOT NULL default '0'");
+
+         //2.7.3
+         $migration->changeField($table, "plugin_order_billstates_id", "plugin_order_billstates_id", "int(11) NOT NULL DEFAULT 0");
       }
 
       // Remove RIGHT_OPENTICKET