Merge branch 'master' into kusanagi (b7bc086a) · Commits · open-source / oscar

.gitignore

+3 −0

Original line number	Diff line number	Diff line
		@@ -159,9 +159,12 @@ OSCAR-UPDATE-RUNNING
		OSCAR-UPDATE-ERROR

		## Interface Graphique
		public/js/oscar/vite
		public/js/oscar/vite/*
		public/js/oscar/vite/dist
		public/js/oscar/vite/dist/*
		public/js/oscar/vite/dist/assets
		public/js/oscar/vite/dist/assets/*

		## Textes personnalisés
		config/autoload/oscar.text.custom.json

module/Oscar/src/Oscar/Entity/Activity.php

+23 −17

Original line number	Diff line number	Diff line
		@@ -35,25 +35,25 @@ class Activity implements ResourceInterface
		if ($statusSelect === null) {
		$statusSelect = [
		self::STATUS_ERROR_STATUS => 'Conflit : pas de statut',
		self::STATUS_ABORDED => 'Abandonné',
		self::STATUS_ACCEPTED => 'Accepté',
		self::STATUS_ACCEPTED_2 => 'Accepté en phase 2',
		self::STATUS_ACTIVE => 'Actif',
		self::STATUS_PROGRESS => 'Brouillon',
		self::STATUS_FENCED => 'Clôturé',
		self::STATUS_DEPOSIT => 'Déposée',
		self::STATUS_ABORDED => 'Dossier abandonné',
		self::STATUS_TERMINATED => 'En cours de clôture',
		self::STATUS_DEPOSIT => 'Déposé',
		self::STATUS_PENDING_FENCED => 'En cours de clôture',
		self::STATUS_PENDING_ACCEPTED => 'En cours de conventionnement',
		self::STATUS_IDENTIFY => 'Identifiée',
		self::STATUS_JUSTIFY => 'Justifiée',
		self::STATUS_IDENTIFY => 'Identifié',
		self::STATUS_JUSTIFY => 'Justifié',
		self::STATUS_DISPUTE => 'Litige',
		self::STATUS_MONTAGE => 'Montage',
		self::STATUS_REFUSED => 'Refusé',
		self::STATUS_REFUSED_2 => 'Refusé en phase 2',
		self::STATUS_REORIENTED => 'Réorienté',
		self::STATUS_TERMINATED => 'Résilié',
		self::STATUS_CLOSED => 'Terminé',
		self::STATUS_TRANSFERED => 'Transféré',
		self::STATUS_MONTAGE => 'Montage',
		];
		}
		return $statusSelect;
		@@ -73,6 +73,7 @@ class Activity implements ResourceInterface
		const STATUS_IDENTIFY = 107; // Identifié
		const STATUS_PENDING_ACCEPTED = 108; // En cours de conventionnement
		const STATUS_ACCEPTED_2 = 109; // Accepté en phase 2
		const STATUS_PENDING_FENCED = 110; // En cours de clôture


		// 200 : Terminées / Abandonnées
		@@ -769,7 +770,8 @@ class Activity implements ResourceInterface
		\DateTime $cache_at = new \DateTime(),
		bool $cache_lock = false,
		string $cache_lock_reason = self::CACHE_REASON_DEFAULT
		): self {
		): self
		{
		$this->cache = $cache_content;
		$this->dateCached = $cache_at;
		if ($cache_lock === true) {
		@@ -814,7 +816,8 @@ class Activity implements ResourceInterface
		?string $value,
		bool $diplayCurrency = true,
		bool $displayPercentInfo = true
		): string {
		): string
		{
		$percent = '';
		$currency = '';
		$data = '';
		@@ -855,7 +858,8 @@ class Activity implements ResourceInterface
		public function getFraisDeGestionPartGestionnaireDisplay(
		bool $diplayCurrency = true,
		bool $displayPercentInfo = true
		) {
		)
		{
		return $this->getFraisDisplay($this->getFraisDeGestionPartGestionnaire());
		}

		@@ -1166,7 +1170,8 @@ class Activity implements ResourceInterface

		public function getActivityTypeChain(
		ActivityTypeService $activityTypeService
		) {
		)
		{
		return $activityTypeService->getActivityTypeChain($this->getActivityType());
		}

		@@ -1342,8 +1347,7 @@ class Activity implements ResourceInterface
		{
		if ($this->getDateNegociation()) {
		return $this->getDateNegociation()->format($format);
		}
		else {
		} else {
		return "";
		}
		}
		@@ -1826,7 +1830,8 @@ class Activity implements ResourceInterface
		$role,
		$start = null,
		$to = null
		) {
		)
		{
		if (!$this->hasOrganization($organization, $role)) {
		$partner = new ActivityOrganization();
		$partner->setOrganization($organization)
		@@ -2073,7 +2078,8 @@ class Activity implements ResourceInterface
		?\DateTime $dateStart = null,
		?\DateTime $dateEnd = null,
		bool $deep = true
		) {
		)
		{
		$found = false;
		/** @var ActivityPerson $activityPerson */
		foreach ($this->persons as $activityPerson) {
		@@ -2395,8 +2401,7 @@ class Activity implements ResourceInterface
		/** @var ActivityPayment $payment */
		foreach ($this->getPayments() as $payment) {
		if (
		$payment->getDatePayment() == $datePayment && $payment->getAmount(
		) == $amount && $payment->getDatePredicted() == $datePredicted
		$payment->getDatePayment() == $datePayment && $payment->getAmount() == $amount && $payment->getDatePredicted() == $datePredicted
		) {
		return true;
		}
		@@ -2415,7 +2420,8 @@ class Activity implements ResourceInterface
		Organization $organization,
		$role = null,
		$deep = true
		) {
		)
		{
		$found = false;
		/** @var ActivityOrganization $relation */
		foreach ($this->organizations as $relation) {