[opendebitdeboisson-commits] r1852 - in branches/fix-tri-widget-dernieres-licences: . obj

[sdet...@users.adullact.net]

Author: sdethyre
Date: 2024-06-05 11:35:52 +0200 (Wed, 05 Jun 2024)
New Revision: 1852

Modified:
branches/fix-tri-widget-dernieres-licences/
branches/fix-tri-widget-dernieres-licences/HISTORY.txt
branches/fix-tri-widget-dernieres-licences/obj/declaration.class.php
Log:
chore(branch): fusion de la branche inte trunk dans la branche dev fix-tri-widget-dernieres-licences

Index: branches/fix-tri-widget-dernieres-licences
===================================================================
--- branches/fix-tri-widget-dernieres-licences 2024-06-04 21:19:30 UTC (rev 1851)
+++ branches/fix-tri-widget-dernieres-licences 2024-06-05 09:35:52 UTC (rev 1852)

Property changes on: branches/fix-tri-widget-dernieres-licences
___________________________________________________________________
Modified: svn:mergeinfo
## -87,4 +87,4 ##
/branches/3.0.0-rec4_suivi_dates_mdd:1313-1355
/branches/3.0.0-rg:1545-1798
/branches/trunk-compat-php80:413-418
-/trunk:1841-1849
\ No newline at end of property
+/trunk:1841-1851
\ No newline at end of property
Modified: branches/fix-tri-widget-dernieres-licences/HISTORY.txt
===================================================================
--- branches/fix-tri-widget-dernieres-licences/HISTORY.txt 2024-06-04 21:19:30 UTC (rev 1851)
+++ branches/fix-tri-widget-dernieres-licences/HISTORY.txt 2024-06-05 09:35:52 UTC (rev 1852)
@@ -4,7 +4,7 @@
3.0.0-rc2 (unreleased)
----------------------

-* Aucun changement.
+* Évolution : Les éditions 'recepisse' et 'cerfa_declaration' sont désormais optionnelles sur la déclaration.


3.0.0-rc1 (25/04/2024)

Modified: branches/fix-tri-widget-dernieres-licences/obj/declaration.class.php
===================================================================
--- branches/fix-tri-widget-dernieres-licences/obj/declaration.class.php 2024-06-04 21:19:30 UTC (rev 1851)
+++ branches/fix-tri-widget-dernieres-licences/obj/declaration.class.php 2024-06-05 09:35:52 UTC (rev 1852)
@@ -29,6 +29,9 @@
),
"view" => "view_cerfa_declaration",
"permission_suffix" => "consulter",
+ "condition" => array(
+ "is_edition_cerfa_declaration_set",
+ ),
);
//
$this->class_actions[12] = array(
@@ -41,6 +44,9 @@
),
"view" => "view_recepisse",
"permission_suffix" => "consulter",
+ "condition" => array(
+ "is_edition_recepisse_set",
+ ),
);
// ACTION - 601 - listing_advs
$this->class_actions[601] = array(
@@ -57,6 +63,42 @@
}

/**
+ * CONDITION - is_edition_recepisse_set.
+ *
+ * @return boolean
+ */
+ function is_edition_recepisse_set() {
+ $inst__om_edition = $this->f->get_inst__om_edition();
+ $edition = $inst__om_edition->get_edition_from_collectivite(
+ "om_etat",
+ "recepisse",
+ $_SESSION["collectivite"]
+ );
+ if (is_null($edition)) {
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * CONDITION - is_edition_cerfa_declaration_set.
+ *
+ * @return boolean
+ */
+ function is_edition_cerfa_declaration_set() {
+ $inst__om_edition = $this->f->get_inst__om_edition();
+ $edition = $inst__om_edition->get_edition_from_collectivite(
+ "om_etat",
+ "cerfa_declaration",
+ $_SESSION["collectivite"]
+ );
+ if (is_null($edition)) {
+ return false;
+ }
+ return true;
+ }
+
+ /**
* GETTER_FORMINC - champs.
*
* - Table de liens 'lien_declaration_contact'.