-
-
Notifications
You must be signed in to change notification settings - Fork 2.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' of [email protected]:Dolibarr/dolibarr.git into d…
…evelop
- Loading branch information
Showing
3 changed files
with
51 additions
and
85 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,30 @@ | ||
| <!-- BEGIN TEMPLATE resource_add.tpl.php --> | ||
| <?php | ||
| /* Copyright (C) 2024 Frédéric France <[email protected]> | ||
| * | ||
| * 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 Conf $conf | ||
| * @var DoliDB $db | ||
| * @var Translate $langs | ||
| * | ||
| * @var string $element | ||
| * @var int $element_id | ||
| * @var string $element_ref | ||
| */ | ||
| // Protection to avoid direct call of template | ||
| if (empty($conf) || !is_object($conf)) { | ||
| print "Error, template page can't be called as URL"; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,32 @@ | ||
| <!-- BEGIN TEMPLATE resource_view.tpl.php --> | ||
| <?php | ||
| /* Copyright (C) 2024 MDW <[email protected]> | ||
| /* Copyright (C) 2024 MDW <[email protected]> | ||
| * Copyright (C) 2024 Frédéric France <[email protected]> | ||
| * | ||
| * 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 Conf $conf | ||
| * @var DoliDB $db | ||
| * @var Translate $langs | ||
| * | ||
| * @var string $element | ||
| * @var int $element_id | ||
| * @var string $mode | ||
| * @var string $resource_type | ||
| * @var array<array{rowid:int,resource_id:int,resource_type:string,busy:int<0,1>,mandatory:int<0,1>}> $linked_resources | ||
| */ | ||
| // Protection to avoid direct call of template | ||
| if (empty($conf) || !is_object($conf)) { | ||
|
|
||