FIX #2415 Ajout alerte en cas d'absence de viseur (si nécessaire) + MAJ actions_pages.xml

core/trunk/core/manage_action.php

@@ -278,6 +278,11 @@ else if(empty($_POST['values']) || !isset($_POST['action_id']) || empty($_POST['
             $frm_test = get_form_txt($arr_id, $_SESSION['config']['businessappurl'].'index.php?display=true&page=manage_action&module=core', $id_action, $_POST['table'],$_POST['module'], $_POST['coll_id'],  $_POST['mode'] );
             echo "{status : 3, form_content : '".$frm_test."', height : '".$frm_height."', width : '".$frm_width."', 'mode_frm' : '".$mode_form."', 'action_status' : '".functions::xssafe($status)."'}";
             exit();
+        }
+		elseif( $_POST['req'] == 'first_request' && $error_visa == true)
+        {
+            echo "{status : 4, error : '".addslashes(_NO_VISA)."', validate : 'OK', 'action_status' : '".functions::xssafe($status)."'}";
+            exit();
         }
         elseif( $_POST['req'] == 'first_request' && $confirm == true)
         {

core/trunk/core/xml/actions_pages.xml

@@ -170,17 +170,6 @@ An action page is described in a ACTIONPAGE tag :
         </COLLECTIONS>
     </ACTIONPAGE>
 	<!-- ACTIONS AJOUTEES PAR DIS -->
-	<ACTIONPAGE>
-        <ID>prepare_visa</ID>
-        <LABEL>_PREPARE_VISA</LABEL>
-        <NAME>prepare_visa</NAME>
-        <ORIGIN>module</ORIGIN>
-        <MODULE>visa</MODULE>
-        <FLAG_CREATE>false</FLAG_CREATE>
-        <COLLECTIONS>
-            <COLL_ID>letterbox_coll</COLL_ID>
-        </COLLECTIONS>
-    </ACTIONPAGE>
 	<ACTIONPAGE>
         <ID>visa_mail</ID>
         <LABEL>_VISA_MAIL</LABEL>
@@ -204,20 +193,9 @@ An action page is described in a ACTIONPAGE tag :
         </COLLECTIONS>
     </ACTIONPAGE>
 	<ACTIONPAGE>
-        <ID>print_folder</ID>
-        <LABEL>_IMPRIM_DOSSIER</LABEL>
-        <NAME>print_folder</NAME>
-        <ORIGIN>module</ORIGIN>
-        <MODULE>visa</MODULE>
-        <FLAG_CREATE>false</FLAG_CREATE>
-        <COLLECTIONS>
-            <COLL_ID>letterbox_coll</COLL_ID>
-        </COLLECTIONS>
-    </ACTIONPAGE>
-	<ACTIONPAGE>
-        <ID>send_email</ID>
-        <LABEL>_SEND_MAIL</LABEL>
-        <NAME>send_email</NAME>
+        <ID>send_to_visa</ID>
+        <LABEL>_SEND_TO_VISA</LABEL>
+        <NAME>send_to_visa</NAME>
         <ORIGIN>module</ORIGIN>
         <MODULE>visa</MODULE>
         <FLAG_CREATE>false</FLAG_CREATE>