Skip to content

Commit 9552b0c

Browse files
committed
Merge branch 'release/2.7.3'
2 parents 274f364 + ccc162b commit 9552b0c

24 files changed

+12161
-12192
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"masnathan/odtphp": "dev-teclib"
55
},
66
"require-dev": {
7-
"glpi-project/tools": "^0.2"
7+
"glpi-project/tools": "^0.3"
88
},
99
"config": {
1010
"optimize-autoloader": true,

composer.lock

Lines changed: 47 additions & 51 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

inc/order.class.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2437,7 +2437,7 @@ public static function install(Migration $migration) {
24372437
`plugin_order_accountsections_id` int(11) NOT NULL default '0' COMMENT 'RELATION to plugin_order_accountsections (id)',
24382438
`locations_id` int(11) NOT NULL default '0' COMMENT 'RELATION to glpi_locations (id)',
24392439
`plugin_order_orderstates_id` int(11) NOT NULL default 1,
2440-
`plugin_order_billstates_id` int(11) NOT NULL default 1,
2440+
`plugin_order_billstates_id` int(11) NOT NULL default 0,
24412441
`port_price` float NOT NULL default 0,
24422442
`global_discount` float NOT NULL default 0,
24432443
`comment` text collate utf8_unicode_ci,
@@ -2696,6 +2696,9 @@ public static function install(Migration $migration) {
26962696

26972697
//2.7.0
26982698
$migration->addField($table, "global_discount", "FLOAT NOT NULL default '0'");
2699+
2700+
//2.7.3
2701+
$migration->changeField($table, "plugin_order_billstates_id", "plugin_order_billstates_id", "int(11) NOT NULL DEFAULT 0");
26992702
}
27002703

27012704
// Remove RIGHT_OPENTICKET

0 commit comments

Comments
 (0)