Skip to content

Commit 273998b

Browse files
committed
feature/glpi-12.0
1 parent 5fe156e commit 273998b

39 files changed

Lines changed: 106 additions & 976 deletions

‎.github/workflows/continuous-integration.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
name: "Generate CI matrix"
2121
uses: "glpi-project/plugin-ci-workflows/.github/workflows/generate-ci-matrix.yml@v1"
2222
with:
23-
glpi-version: "11.0.x"
23+
glpi-version: "12.0.x"
2424
ci:
2525
name: "GLPI ${{ matrix.glpi-version }} - php:${{ matrix.php-version }} - ${{ matrix.db-image }}"
2626
needs: "generate-ci-matrix"

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
77

88
## [UNRELEASED]
99

10+
### Added
11+
12+
- GLPI 12 compatibility
13+
1014
### Fixed
1115

1216
- Fix `Take item delivery` and `Cancel reception` action for `Software License`

‎Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
include ../../PluginsMakefile.mk

‎ajax/billactions.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* -------------------------------------------------------------------------
2929
*/
3030

31-
Session::checkRight("plugin_order_bill", READ);
31+
Session::checkRight(PluginOrderBill::$rightname, READ);
3232

3333
header("Content-Type: text/html; charset=UTF-8");
3434

‎ajax/dropdownReference.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
include_once(__DIR__ . "/../../../inc/includes.php");
3535

36-
Session::checkRight("plugin_order_reference", READ);
36+
Session::checkRight(PluginOrderReference::$rightname, READ);
3737

3838
// Make a select box for references
3939
if (isset($_POST["itemtype"])) {

‎ajax/dropdownSupplier.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
Html::header_nocache();
3636
}
3737

38-
Session::checkRight("contact_enterprise", READ);
38+
Session::checkRight(Contact::$rightname, READ);
3939

4040
// Make a select box
4141
if (isset($_POST["suppliers_id"])) {

‎composer.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
"php": ">=8.2",
55
"sboden/odtphp": "^3.2"
66
},
7-
"require-dev": {
8-
"glpi-project/tools": "^0.8"
9-
},
107
"config": {
118
"optimize-autoloader": true,
129
"platform": {

0 commit comments

Comments
 (0)