Skip to content

feature/glpi-12.0 #597

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Rom1-B wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feature/glpi-12.0 #597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/continuous-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
name: "Generate CI matrix"
uses: "glpi-project/plugin-ci-workflows/.github/workflows/generate-ci-matrix.yml@v1"
with:
glpi-version: "11.0.x"
glpi-version: "12.0.x"
ci:
name: "GLPI ${{ matrix.glpi-version }} - php:${{ matrix.php-version }} - ${{ matrix.db-image }}"
needs: "generate-ci-matrix"
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

## [UNRELEASED]

### Added

- GLPI 12 compatibility

### Fixed

- Fix `Take item delivery` and `Cancel reception` action for `Software License`
Expand Down
1 change: 1 addition & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include ../../PluginsMakefile.mk
2 changes: 1 addition & 1 deletion ajax/billactions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
* -------------------------------------------------------------------------
*/

Session::checkRight("plugin_order_bill", READ);
Session::checkRight(PluginOrderBill::$rightname, READ);

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

Expand Down
2 changes: 1 addition & 1 deletion ajax/dropdownReference.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

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

Session::checkRight("plugin_order_reference", READ);
Session::checkRight(PluginOrderReference::$rightname, READ);

// Make a select box for references
if (isset($_POST["itemtype"])) {
Expand Down
2 changes: 1 addition & 1 deletion ajax/dropdownSupplier.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
Html::header_nocache();
}

Session::checkRight("contact_enterprise", READ);
Session::checkRight(Contact::$rightname, READ);

// Make a select box
if (isset($_POST["suppliers_id"])) {
Expand Down
3 changes: 0 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
"php": ">=8.2",
"sboden/odtphp": "^3.2"
},
"require-dev": {
"glpi-project/tools": "^0.8"
},
"config": {
"optimize-autoloader": true,
"platform": {
Expand Down
Loading