diff --git a/html/dossier_prefs.php b/html/dossier_prefs.php index eb94e5c18..a43a6cbc3 100644 --- a/html/dossier_prefs.php +++ b/html/dossier_prefs.php @@ -35,7 +35,7 @@ include_once ("top_menu_compta.php"); ShowMenuCompta($g_dossier,$g_UserProperty); -ShowMenuComptaRight($g_dossier,$g_UserProperty); +// ShowMenuComptaRight($g_dossier,$g_UserProperty); include_once ("check_priv.php"); if ( $g_UserProperty['use_admin'] == 0 ) { diff --git a/html/fiche.php b/html/fiche.php index 7f584ef61..e62e74ee2 100644 --- a/html/fiche.php +++ b/html/fiche.php @@ -52,7 +52,7 @@ $cn=DbConnect($l_Db); -ShowMenuComptaRight($g_dossier,$g_UserProperty); +// ShowMenuComptaRight($g_dossier,$g_UserProperty); if ( $g_UserProperty['use_admin'] == 0 ) { $read=CheckAction($g_dossier,$g_user,FICHE_READ); $write=CheckAction($g_dossier,$g_user,FICHE_WRITE); diff --git a/html/index.php b/html/index.php index 579404922..69701d82b 100644 --- a/html/index.php +++ b/html/index.php @@ -7,6 +7,7 @@ echo '
Logo
+
diff --git a/html/user_advanced.php b/html/user_advanced.php index ff9a0bc47..548cce536 100644 --- a/html/user_advanced.php +++ b/html/user_advanced.php @@ -44,7 +44,7 @@ include_once ("top_menu_compta.php"); ShowMenuCompta($g_dossier,$g_UserProperty); // Show the right menus -ShowMenuComptaRight($g_dossier,$g_UserProperty); +// ShowMenuComptaRight($g_dossier,$g_UserProperty); $left_menu=ShowMenuAdvanced(); echo '
'; diff --git a/html/user_jrn.php b/html/user_jrn.php index 26ebaa398..465feb364 100644 --- a/html/user_jrn.php +++ b/html/user_jrn.php @@ -62,80 +62,88 @@ if ( $g_UserProperty['use_admin'] == 0 ) { } // if isset g_jrn } -// a journal is selected -// then we show the available journals of this type -if ( isset ($_GET['JRN_TYPE'] ) ) { - $p_array=array(array("user_jrn.php?JRN_TYPE=VEN" ,"Entrée"), - array("user_jrn.php?JRN_TYPE=ACH","Dépense"), - array("user_jrn.php?JRN_TYPE=FIN","Financier"), - array("user_jrn.php?JRN_TYPE=OD","Op. Diverses"), - array("","Impression"), - array("","Recherche") - ); +// if show +if ( isset ($_GET['show'])) { + + $p_array=array(array("user_jrn.php?JRN_TYPE=VEN" ,"Entrée"), + array("user_jrn.php?JRN_TYPE=ACH","Dépense"), + array("user_jrn.php?JRN_TYPE=FIN","Financier"), + array("user_jrn.php?JRN_TYPE=OD","Op. Diverses"), + array("","Impression"), + array("","Recherche") + ); $result=ShowItem($p_array,'H',"cell"); - echo "
"; - echo $result; - echo "
"; - - $jrn_type=$_GET['JRN_TYPE']; - echo_debug(__FILE__,__LINE__,"jrn_type = $jrn_type"); - session_register("jrn_type"); - if ( $jrn_type=='VEN' ) include('user_action_ven.php'); - if ( $jrn_type=='ACH' ) include('user_action_ach.php'); - if ( $jrn_type=='FIN' ) include('user_action_fin.php'); - if ( $jrn_type=='OD' ) include('user_action_ods.php'); - -} - -// the parameters show is given -// in that case we should a submenu -if ( isset ($_GET['show']) ) { - $g_jrn=-1; - $p_array=array(array("user_jrn.php?JRN_TYPE=VEN" ,"Entrée"), - array("user_jrn.php?JRN_TYPE=ACH","Dépense"), - array("user_jrn.php?JRN_TYPE=FIN","Financier"), - array("user_jrn.php?JRN_TYPE=OD","Op. Diverses"), - array("","Impression"), - array("","Recherche") - ); - $result=ShowItem($p_array,'H',"cell"); - echo "
"; - echo $result; - echo "
"; - - + echo "
"; + echo $result; + echo "
"; + exit(); } - - // if a journal is selected show the journal's menu -if ( isset ($_GET['action']) ) { - $p_array=array(array("user_jrn.php?JRN_TYPE=VEN" ,"Entrée"), - array("user_jrn.php?JRN_TYPE=ACH","Dépense"), - array("user_jrn.php?JRN_TYPE=FIN","Financier"), - array("user_jrn.php?JRN_TYPE=OD","Op. Diverses"), - array("","Impression"), - array("","Recherche") - ); - $result=ShowItem($p_array,'H',"cell"); - echo "
"; - echo $result; - echo "
"; - +if ( isset ($_GET['JRN_TYPE'] ) ) { + $jrn_type=$_GET['JRN_TYPE']; + switch ($jrn_type) { + case 'VEN': + echo 'Vente'; + break; + case 'ACH': + echo 'Achat'; + break; + case 'FIN': + echo 'Financier'; + break; + case 'OD': + echo 'Opérations diverses'; + break; + } + ShowMenuJrnUser($g_dossier,$g_UserProperty,$_GET['JRN_TYPE'],$g_jrn); +} else { + echo_debug("Selected is $g_jrn"); // Get the jrn_type_id include_once('jrn.php'); + $JrnProp=GetJrnProp($g_dossier,$g_jrn); + $jrn_type=$JrnProp['jrn_def_type']; + echo_debug("Type is $jrn_type"); + echo_debug("Jrn_def_type = $jrn_type"); + switch ( $jrn_type ) { + case 'VEN': + echo 'Vente'; + break; + case 'ACH': + echo 'Achat'; + break; + case 'FIN': + echo 'Financier'; + break; + case 'OD': + echo 'Opérations diverses'; + break; + } + + ShowMenuJrnUser($g_dossier,$g_UserProperty,$jrn_type,$g_jrn); +} + + // if a journal is selected show the journal's menu +if ( $g_jrn != -1 ) { + + // Get the jrn_type_id + include_once('jrn.php'); + $JrnProp=GetJrnProp($g_dossier,$g_jrn); + $jrn_type=$JrnProp['jrn_def_type']; // display jrn's menu - include_once('user_menu.php'); - $menu_jrn=u_ShowMenuJrn($cn,$jrn_type); - echo '
'; - echo $menu_jrn; - echo '
'; - echo_debug(__FILE__,__LINE__,"jrn_type = $jrn_type"); + include_once('user_menu.php'); + $menu_jrn=u_ShowMenuJrn($cn,$jrn_type); + echo '
'; + + echo $menu_jrn; + echo '
'; + // Execute Action for g_jrn if ( $jrn_type=='VEN' ) include('user_action_ven.php'); if ( $jrn_type=='ACH' ) include('user_action_ach.php'); if ( $jrn_type=='FIN' ) include('user_action_fin.php'); if ( $jrn_type=='OD ' ) include('user_action_ods.php'); } // if isset g_jrn + html_page_stop(); ?> diff --git a/html/user_pref.php b/html/user_pref.php index d4e116129..a05fda0dd 100644 --- a/html/user_pref.php +++ b/html/user_pref.php @@ -54,9 +54,9 @@ CheckUser(); include_once ("top_menu_compta.php"); if ( isset ($g_dossier) ) { if ( $g_dossier != 0 ) ShowMenuCompta($g_dossier,$g_UserProperty); - ShowMenuComptaRight($g_dossier,$g_UserProperty); + // ShowMenuComptaRight($g_dossier,$g_UserProperty); } else { - ShowMenuComptaRight(0,$g_UserProperty); + // ShowMenuComptaRight(0,$g_UserProperty); } diff --git a/include/user_action_ach.php b/include/user_action_ach.php index bc55f1995..f75d95202 100644 --- a/include/user_action_ach.php +++ b/include/user_action_ach.php @@ -28,7 +28,7 @@ $cn=DbConnect($dossier); // phpinfo(); if ( ! isset ($_GET['action']) && ! isset ($_POST["action"]) ) { - echo u_ShowMenuJrn($cn,$jrn_type); + // echo u_ShowMenuJrn($cn,$jrn_type); exit; } diff --git a/include/user_action_fin.php b/include/user_action_fin.php index 392aedeb9..943daa0d1 100644 --- a/include/user_action_fin.php +++ b/include/user_action_fin.php @@ -25,7 +25,7 @@ $dossier=sprintf("dossier%d",$g_dossier); $cn=DbConnect($dossier); if ( ! isset ($_GET['action']) && ! isset ($_POST["action"]) ) { - echo u_ShowMenuJrn($cn,$jrn_type); + // echo u_ShowMenuJrn($cn,$jrn_type); exit; return; diff --git a/include/user_action_ods.php b/include/user_action_ods.php index 2238c749d..4add8e8b8 100644 --- a/include/user_action_ods.php +++ b/include/user_action_ods.php @@ -25,7 +25,7 @@ $dossier=sprintf("dossier%d",$g_dossier); $cn=DbConnect($dossier); if ( ! isset ($_GET['action']) && ! isset ($_POST["action"]) ) { - echo u_ShowMenuJrn($cn,$jrn_type); + // echo u_ShowMenuJrn($cn,$jrn_type); exit; } diff --git a/include/user_action_ven.php b/include/user_action_ven.php index e2d4ef39f..02ab6abe0 100644 --- a/include/user_action_ven.php +++ b/include/user_action_ven.php @@ -24,8 +24,8 @@ $dossier=sprintf("dossier%d",$g_dossier); $cn=DbConnect($dossier); // default action is insert_vente if ( ! isset ($_GET['action']) && ! isset ($_POST["action"]) ) { - $action='insert_vente'; - $blank=1; + // echo u_ShowMenuJrn($cn,$jrn_type); + exit; } else { $action=(isset($_GET['action']))?$_GET['action']:$_POST['action']; $blank=(isset($_GET["blank"]))?1:0; diff --git a/include/user_menu.php b/include/user_menu.php index 41650f113..b34b44728 100644 --- a/include/user_menu.php +++ b/include/user_menu.php @@ -276,6 +276,7 @@ function u_ShowMenuJrnUser($p_dossier,$p_user,$p_type,$p_jrn) } }// if right }// for + echo ''; echo "
"; echo ''; @@ -305,7 +306,7 @@ function u_ShowMenuJrn($p_cn,$p_jrn_type) $ret=""; for ($i=0;$i<$num;$i++) { $action=pg_fetch_array($Res,$i); - $ret.=sprintf('', + $ret.=sprintf('', $action['ja_url'],$action['ja_action'],$action['ja_name']); } $ret.='
%s
%s
';