[openads-Commits] r18046 - in branches/6.6.0-develop--ihm-ajout_module: . obj

[ejpri...@users.adullact.net]

Author: ejpritchard
Date: 2024-06-24 08:46:53 +0200 (Mon, 24 Jun 2024)
New Revision: 18046

Modified:
branches/6.6.0-develop--ihm-ajout_module/
branches/6.6.0-develop--ihm-ajout_module/HISTORY.txt
branches/6.6.0-develop--ihm-ajout_module/obj/
branches/6.6.0-develop--ihm-ajout_module/obj/extra_data_store.impl_2_tables.php
Log:
merge: fusion de la branche inte '6.6.0-develop' dans la branche de dev '6.6.0-develop--ihm-ajout-module'

Index: branches/6.6.0-develop--ihm-ajout_module
===================================================================
--- branches/6.6.0-develop--ihm-ajout_module 2024-06-21 17:12:34 UTC (rev 18045)
+++ branches/6.6.0-develop--ihm-ajout_module 2024-06-24 06:46:53 UTC (rev 18046)

Property changes on: branches/6.6.0-develop--ihm-ajout_module
___________________________________________________________________
Modified: svn:mergeinfo
## -713,7 +713,7 ##
/branches/6.5.0-develop-error-contrainte-traitement-sig:17384-17432
/branches/6.5.0-develop_fix_avis_produit_onglet_pieces:17288-17414
/branches/6.6.0-10411:17736-17870
-/branches/6.6.0-develop:17965-18036
+/branches/6.6.0-develop:17965-18045
/branches/6.6.0-develop--fix-evol-mod:17681-18023
/branches/6.6.0-develop--impl-extra-data:17897-18034
/branches/6.6.0-develop--improve-task:17580-17609
Modified: branches/6.6.0-develop--ihm-ajout_module/HISTORY.txt
===================================================================
--- branches/6.6.0-develop--ihm-ajout_module/HISTORY.txt 2024-06-21 17:12:34 UTC (rev 18045)
+++ branches/6.6.0-develop--ihm-ajout_module/HISTORY.txt 2024-06-24 06:46:53 UTC (rev 18046)
@@ -3,8 +3,9 @@

6.6.0 (unreleased)
------------------
-*
-* Correction - Dans le listing, des instructions d'un dossier d'instruction, les modules sont ignorés .
+* Evolution - Système de stockage de données arbitraires.
+ Ticket #10406.
+* Correction - Dans le listing, des instructions d'un dossier d'instruction, les modules sont ignorés.
Ticket #10434.
* Correction - Suppression d'écriture de log non nécessaire
Ticket #10413.

Index: branches/6.6.0-develop--ihm-ajout_module/obj
===================================================================
--- branches/6.6.0-develop--ihm-ajout_module/obj 2024-06-21 17:12:34 UTC (rev 18045)
+++ branches/6.6.0-develop--ihm-ajout_module/obj 2024-06-24 06:46:53 UTC (rev 18046)

Property changes on: branches/6.6.0-develop--ihm-ajout_module/obj
___________________________________________________________________
Modified: svn:mergeinfo
## -672,7 +672,7 ##
/branches/6.5.0-develop-error-contrainte-traitement-sig/obj:17384-17432
/branches/6.5.0-develop_fix_avis_produit_onglet_pieces/obj:17288-17414
/branches/6.6.0-10411/obj:17736-17870
-/branches/6.6.0-develop/obj:17965-18036
+/branches/6.6.0-develop/obj:17965-18045
/branches/6.6.0-develop--fix-evol-mod/obj:17681-18023
/branches/6.6.0-develop--impl-extra-data/obj:17897-18034
/branches/6.6.0-develop--improve-task/obj:17580-17609
Modified: branches/6.6.0-develop--ihm-ajout_module/obj/extra_data_store.impl_2_tables.php
===================================================================
--- branches/6.6.0-develop--ihm-ajout_module/obj/extra_data_store.impl_2_tables.php 2024-06-21 17:12:34 UTC (rev 18045)
+++ branches/6.6.0-develop--ihm-ajout_module/obj/extra_data_store.impl_2_tables.php 2024-06-24 06:46:53 UTC (rev 18046)
@@ -45,7 +45,7 @@
'CRITICAL');
return $err_msg;
}
- $this->log(__METHOD__, "ajout du champ dynamique ($object_name, $name)", 'INFO');
+ $this->log(__METHOD__, "ajout du champ dynamique ($object_name, $name)");
}
return true;
}