Merge branch '2025-05-privilege-ui' into kusanagi (331ff411) · Commits · open-source / oscar

docker/postgres_initdb.d/sql/001-structure.sql

deleted100644 → 0

+0 −6825

File deleted.

Preview size limit exceeded, changes collapsed.

docker/postgres_initdb.d/sql/01-structure-empty.sql

0 → 100644

+0 −0

Empty file added.

docker/postgres_initdb.d/sql/02-functions-triggers.sql

0 → 100644

+0 −0

Empty file added.

install/init-data-core.json

0 → 100644

+229 −0

Changes for install/init-data-core.json: 229 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		{
		"activity_type": [
		{
		"label": "ANR",
		"description": "",
		"lft": 3,
		"rgt": 4,
		"nature": "0",
		"status": 1
		},
		{
		"label": "PIA",
		"description": "",
		"lft": 5,
		"rgt": 6,
		"nature": "0",
		"status": 1
		},
		{
		"label": "Subvention nationale",
		"description": "",
		"lft": 2,
		"rgt": 9,
		"nature": "0",
		"status": 1
		},
		{
		"label": "BPI",
		"description": "",
		"lft": 7,
		"rgt": 8,
		"nature": "0",
		"status": 1
		},
		{
		"label": "CPER",
		"description": "",
		"lft": 11,
		"rgt": 12,
		"nature": "0",
		"status": 1
		},
		{
		"label": "Subvention r\u00e9gionale",
		"description": "",
		"lft": 10,
		"rgt": 15,
		"nature": "0",
		"status": 1
		},
		{
		"label": "CPIER",
		"description": "",
		"lft": 13,
		"rgt": 14,
		"nature": "0",
		"status": 1
		},
		{
		"label": "EUREKA",
		"description": "",
		"lft": 17,
		"rgt": 18,
		"nature": "0",
		"status": 1
		},
		{
		"label": "FP6",
		"description": "",
		"lft": 19,
		"rgt": 20,
		"nature": "0",
		"status": 1
		},
		{
		"label": "FP7",
		"description": "",
		"lft": 21,
		"rgt": 22,
		"nature": "0",
		"status": 1
		},
		{
		"label": "H2020",
		"description": "",
		"lft": 23,
		"rgt": 24,
		"nature": "0",
		"status": 1
		},
		{
		"label": "ROOT",
		"description": "",
		"lft": 1,
		"rgt": 28,
		"nature": "Recherche et valorisation",
		"status": 1
		},
		{
		"label": "Subvention europ\u00e9enne",
		"description": "",
		"lft": 16,
		"rgt": 27,
		"nature": "0",
		"status": 1
		},
		{
		"label": "INTERREG",
		"description": "",
		"lft": 25,
		"rgt": 26,
		"nature": "0",
		"status": 1
		}
		],
		"currency": [
		{
		"label": "Euro",
		"rate": 1,
		"symbol": "\u20ac"
		},
		{
		"label": "Livre",
		"rate": 0.7133,
		"symbol": "\u00a3"
		},
		{
		"label": "Yens",
		"rate": 132.651,
		"symbol": "\u00a5"
		},
		{
		"label": "Dollars",
		"rate": 1.096,
		"symbol": "$"
		}
		],
		"tva": [
		{
		"label": "Exon\u00e9r\u00e9",
		"rate": 0,
		"active": true,
		"status": 1
		},
		{
		"label": "Taux r\u00e9duit (5,5%)",
		"rate": 5.5,
		"active": true,
		"status": 1
		},
		{
		"label": "Taux normal (19,6%)",
		"rate": 19.6,
		"active": true,
		"status": 1
		},
		{
		"label": "Taux DOM-TOM",
		"rate": 8.5,
		"active": true,
		"status": 1
		},
		{
		"label": "Taux r\u00e9duit 7%",
		"rate": 7,
		"active": true,
		"status": 1
		},
		{
		"label": "Taux normal 20%",
		"rate": 20,
		"active": true,
		"status": 1
		},
		{
		"label": "Taux r\u00e9duit 10%",
		"rate": 10,
		"active": true,
		"status": 1
		}
		],
		"organization_type": [
		{
		"label": "Collectivit\u00e9",
		"description": "",
		"root": null
		},
		{
		"label": "Laboratoire",
		"description": "",
		"root": null
		},
		{
		"label": "Composante",
		"description": "",
		"root": null
		},
		{
		"label": "Institution",
		"description": "",
		"root": null
		},
		{
		"label": "Priv\u00e9",
		"description": "",
		"root": null
		},
		{
		"label": "Soci\u00e9t\u00e9",
		"description": "",
		"root": "Priv\u00e9"
		},
		{
		"label": "Fondation",
		"description": "",
		"root": "Priv\u00e9"
		},
		{
		"label": "Publique",
		"description": "",
		"root": null
		},
		{
		"label": "Association",
		"description": "",
		"root": "Priv\u00e9"
		}
		]
		}
		No newline at end of file

module/Oscar/config/module.config.php

+1 −0

Changes for module/Oscar/config/module.config.php: 1 added line, 0 removed lines.
Original line number	Diff line number	Diff line
		@@ -591,6 +591,7 @@ return array(
		\Oscar\Service\ConnectorService::class => \Oscar\Service\ConnectorServiceFactory::class,
		\Oscar\Service\ContractDocumentService::class => \Oscar\Service\ContractDocumentServiceFactory::class,
		\Oscar\Service\DocumentFormatterService::class => \Oscar\Service\DocumentFormatterServiceFactory::class,
		\Oscar\Service\Fixture\FixtureService::class => \Oscar\Service\Fixture\FixtureServiceFactory::class,
		\Oscar\Service\GearmanJobLauncherService::class => \Oscar\Service\GearmanJobLauncherServiceFactory::class,
		\Oscar\Service\JsonFormatterService::class => \Oscar\Service\JsonFormatterServiceFactory::class,
		'Logger' => \Oscar\Service\LoggerServiceFactory::class,