From 6e1c536564e31815a2f42e9e2a223e35f572e3f1 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Sun, 1 Sep 2024 22:01:00 +0200
Subject: [PATCH 1/2] CFGMENU : bug cannot update menu

---
 include/class/menu_ref.class.php | 4 +++-
 include/menu.inc.php             | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/include/class/menu_ref.class.php b/include/class/menu_ref.class.php
index aab3b5f0c..f86c0c0a0 100644
--- a/include/class/menu_ref.class.php
+++ b/include/class/menu_ref.class.php
@@ -45,8 +45,10 @@ class Menu_Ref extends Menu_Ref_SQL
         {
              throw new Exception(_("le code ne peut être vide"));
         }
+
             $this->format_code();
-            if ( $this->cn->get_value("select count(*) from menu_ref where me_code=$1",array($this->me_code)) > 0)
+            if (isset ($_POST['create_menu'])
+                && $this->cn->get_value("select count(*) from menu_ref where me_code=$1",array($this->me_code)) > 0)
                     throw new Exception ('Doublon');
             if (trim($this->me_code)=='')
                     throw new Exception ('Ce menu existe déjà');
diff --git a/include/menu.inc.php b/include/menu.inc.php
index 47b626611..0dbdd3c06 100644
--- a/include/menu.inc.php
+++ b/include/menu.inc.php
@@ -86,6 +86,7 @@ if ( isset($_POST['create_menu'])|| isset($_POST['modify_menu']))
 	{
 		if (isset($_POST['create_menu']))
 		{
+			if ($menu_ref->verify() == 0)
 			$menu_ref->insert();
 		}
 		elseif (isset($_POST['modify_menu']))

From cd8ffc6b5222304f9d180205a8fb5090388d0690 Mon Sep 17 00:00:00 2001
From: sparkyx <danydb@noalyss.eu>
Date: Sun, 1 Sep 2024 22:32:52 +0200
Subject: [PATCH 2/2] C0OPT1 , C1MENU : improve doc

---
 include/class/contact_option_ref_mtable.class.php | 11 ++++++++++-
 include/contact_option_ref.inc.php                |  2 +-
 include/lib/message_javascript.php                |  1 +
 sql/upgrade.sql                                   |  4 ++++
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/include/class/contact_option_ref_mtable.class.php b/include/class/contact_option_ref_mtable.class.php
index 07cc21408..0f0a15668 100644
--- a/include/class/contact_option_ref_mtable.class.php
+++ b/include/class/contact_option_ref_mtable.class.php
@@ -48,6 +48,15 @@ class Contact_Option_Ref_MTable extends Manage_Table_SQL{
              ["label"=>_("Date"),"value"=>2],
              ["label"=>_("Coche"),"value"=>4]
          ]);
+         $this->set_col_tips("cor_value_select", 87);
      }
-
+    function input()
+    {
+        echo    '<p class="info">'.
+            '<a href="https://wiki.noalyss.eu/doku.php?id=menu::c0opt1" target="_blank">'.
+            _("Aide : voir C0OPT1").
+            '</a>'.
+            '</p>';
+        return parent::input(); // TODO: Change the autogenerated stub
+    }
 }
diff --git a/include/contact_option_ref.inc.php b/include/contact_option_ref.inc.php
index 5975ae8e1..8c90a49ca 100644
--- a/include/contact_option_ref.inc.php
+++ b/include/contact_option_ref.inc.php
@@ -40,7 +40,7 @@ catch (Exception $ex)
 }
 $cn=Dossier::connect();
 echo    '<p class="info">'.
-        '<a href="https://wiki.noalyss.eu/doku.php?id=menu:cfgaction" target="_blank">'.
+        '<a href="https://wiki.noalyss.eu/doku.php?id=menu:c0act" target="_blank">'.
         _("Aide : voir C0ACT").
         '</a>'.
         '</p>';
diff --git a/include/lib/message_javascript.php b/include/lib/message_javascript.php
index 1b303d7a2..75b38033c 100644
--- a/include/lib/message_javascript.php
+++ b/include/lib/message_javascript.php
@@ -120,4 +120,5 @@ content[83]="<?php echo htmlspecialchars(_("Données invalides "),ENT_QUOTES)?>"
 content[84]="<?php echo htmlspecialchars(_("En Belgique, l'exercice commence par un report des comptes de 0 à 5, mais pas en France, ce solde est calculé depuis le tout premier exercice"),ENT_QUOTES)?>";
 content[85]="<?php echo htmlspecialchars(_("Solde créditeur au lieu de débiteur"),ENT_QUOTES)?>";
 content[86]="<?php echo htmlspecialchars(_("Solde débiteur au lieu de créditeur"),ENT_QUOTES)?>";
+content[87]="<?php echo htmlspecialchars(_("Uniquement pour les choix, séparer les valeurs possibles par un |"),ENT_QUOTES)?>";
 </script>
diff --git a/sql/upgrade.sql b/sql/upgrade.sql
index e69de29bb..0a1bfa1c3 100644
--- a/sql/upgrade.sql
+++ b/sql/upgrade.sql
@@ -0,0 +1,4 @@
+begin;
+
+select replace_menu_code('CCARDAT','C0CARD');
+