From 7f94c79423ff7e1c0c6aa80adf0f43363aeb342d Mon Sep 17 00:00:00 2001 From: sparkyx Date: Sun, 6 Mar 2005 15:15:56 +0000 Subject: [PATCH] removed obsolete files --- doc/function.txt | 38 +++++- doc/makedoc | 1 + html/central.php | 2 +- html/dossier_prefs.php | 4 +- html/enc_jrn.php | 289 ----------------------------------------- html/facturation.php | 2 +- html/fiche.php | 2 +- html/form.php | 2 +- html/jrn_add.php | 4 +- html/jrn_detail.php | 9 +- html/jrn_update.php | 4 +- html/line_update.php | 6 +- html/pcmn_update.php | 2 +- html/recherche.php | 2 +- html/stock.php | 2 +- html/user_advanced.php | 2 +- html/user_compta.php | 2 +- html/user_impress.php | 2 +- html/user_jrn.php | 7 +- html/user_pref.php | 2 +- html/user_sec.php | 2 +- include/user_menu.php | 98 +++++++++++++- 22 files changed, 157 insertions(+), 327 deletions(-) delete mode 100644 html/enc_jrn.php diff --git a/doc/function.txt b/doc/function.txt index 99df37250..9ea4022e7 100644 --- a/doc/function.txt +++ b/doc/function.txt @@ -1,6 +1,4 @@ -************************* File = admin_dossier.php **************** ************************* File = admin_repo.php **************** -************************* File = advanced.php **************** ************************* File = annulation.php **************** ************************* File = a.php **************** ************************* File = bal_csv.php **************** @@ -8,8 +6,6 @@ ************************* File = central.php **************** ************************* File = class.ezpdf.php **************** ************************* File = class.pdf.php **************** -************************* File = compta_login.php **************** -************************* File = compta.php **************** ************************* File = c.php **************** ************************* File = dossier_prefs.php **************** ************************* File = d.php **************** @@ -22,7 +18,6 @@ ************************* File = fiche_search.php **************** ************************* File = form.php **************** ************************* File = html_balance.php **************** -************************* File = impress.php **************** ************************* File = index.php **************** ************************* File = jrn_add.php **************** ************************* File = jrn_csv.php **************** @@ -44,11 +39,9 @@ ************************* File = print_invoice.php **************** ************************* File = priv_user.php **************** ************************* File = rapprochement.php **************** -************************* File = rate_chg.php **************** ************************* File = readme.php **************** ************************* File = recherche.php **************** ************************* File = send_jrn_pdf.php **************** -************************* File = send.php **************** ************************* File = send_poste_pdf.php **************** ************************* File = show_tva.php **************** ************************* File = stock.php **************** @@ -1696,6 +1689,32 @@ postgres.php * parameter p_connection db connection postgres.php * p_string sql string postgres.php * return false if error otherwise true postgres.php */ +postgres.php /* function GetAllUser +postgres.php * Return all the users +postgres.php * as an array +postgres.php */ +postgres.php /* function GetUid +postgres.php * Check if the User is valid +postgres.php * and return an array with his property +postgres.php */ +postgres.php /* function GetPriv +postgres.php * Get the privilege of an user on a folder +postgres.php */ +postgres.php /* function ExisteJnt +postgres.php * Get the number of rows +postgres.php * from table jnt_use_dos where $p_dossier = dos_id and +postgres.php * use_id=$p_user +postgres.php */ +postgres.php /* function GetDossierName +postgres.php * Param: id of a dossier +postgres.php * return : Name of the dossier +postgres.php */ +postgres.php /* function GetSequence +postgres.php * get the current sequence +postgres.php */ +postgres.php /* function NextSequence +postgres.php * get the current sequence +postgres.php */ postgres.php /* function SyncRight postgres.php * Purpose : Synchronize les droits par défaut postgres.php * avec les journaux existants @@ -1910,6 +1929,11 @@ stock_inc.php * gen : stock_inc.php * - stock_inc.php * return: stock_inc.php */ +stock_inc.php /* function GetQuantity($p_cn,$p_sg_code,$year,$p_type 'd' or 'c' +stock_inc.php * purpose return the quantity of a sg_code for the period +stock_inc.php * +stock_inc.php * Return number or NULL +stock_inc.php */ ************************* File = top_menu_compta.php **************** top_menu_compta.php /* function ShowMenu top_menu_compta.php * Purpose : Show The login menu diff --git a/doc/makedoc b/doc/makedoc index fb26a5ae1..dae0f44b2 100755 --- a/doc/makedoc +++ b/doc/makedoc @@ -8,6 +8,7 @@ ext_dir () ) >> $BASE_DIR/function.txt done } +rm -f $BASE_DIR/function.txt cd ../html diff --git a/html/central.php b/html/central.php index 19be195ca..45f2670ed 100644 --- a/html/central.php +++ b/html/central.php @@ -37,7 +37,7 @@ include ("check_priv.php"); include_once("preference.php"); -include_once ("top_menu_compta.php"); +include_once ("user_menu.php"); ShowMenuCompta($_SESSION['g_dossier']); if ( $_SESSION['use_admin']==0 ) { diff --git a/html/dossier_prefs.php b/html/dossier_prefs.php index 6c519a3e3..fb8283934 100644 --- a/html/dossier_prefs.php +++ b/html/dossier_prefs.php @@ -33,8 +33,8 @@ $User=new cl_user($rep); $User->Check(); include("preference.php"); -include_once ("top_menu_compta.php"); - +// include_once ("top_menu_compta.php"); +include_once("user_menu.php"); ShowMenuCompta($_SESSION['g_dossier']); diff --git a/html/enc_jrn.php b/html/enc_jrn.php deleted file mode 100644 index 28d685fe9..000000000 --- a/html/enc_jrn.php +++ /dev/null @@ -1,289 +0,0 @@ -Check(); -if ( isset( $p_jrn )) { - $_SESSION["g_jrn"]; - $g_jrn=$p_jrn; -} - $cn=DbConnect($g_dossier); - -echo ''; -echo JS_CONCERNED_OP; -echo JS_VIEW_JRN_DETAIL; - -/* Get MaxLine */ -include_once("poste.php"); -include_once ("top_menu_compta.php"); -ShowMenuCompta($g_dossier,$g_UserProperty); -ShowMenuComptaRight($g_dossier,$g_UserProperty); -if ( $g_UserProperty['use_admin'] == 0 ) { - $r=CheckAction($g_dossier,$g_user,ENCJRN); - if ($r == 0 ){ - /* Cannot Access */ - NoAccess(); - } - if ( isset ($g_jrn)) { - $right=CheckJrn($g_dossier,$g_user,$g_jrn); - if ($right == 0 ){ - /* Cannot Access */ - NoAccess(); - exit -1; - } - } // if isset g_jrn - -} - -ShowMenuJrnUser($g_dossier,$g_UserProperty); - -if ( isset ( $_GET["action"] )) { - if ( $_GET["action"] == "view" ) { - - // view all the journal's operation - echo '
'; - ShowMenuRecherche($g_dossier,$g_jrn); - ViewJrn($g_dossier,$g_user,$g_jrn,"enc_jrn.php"); - echo '
'; - } - if ( $_GET["action"] == "record" ) { - if ( CheckJrn($g_dossier,$g_user,$g_jrn) < 2 ) { - NoAccess(); - exit -1; - - } - echo_debug(__FILE__,__LINE__,"record"); - $max_deb=$_GET["max_deb"]; - $max_cred=$_GET["max_cred"]; - RecordJrn($g_dossier,$g_user,$g_jrn,$max_deb,$max_cred); - } - - if ($_GET["action"]=="update" ) { - if ( CheckJrn($g_dossier,$g_user,$g_jrn) < 2 ) { - NoAccess(); - exit -1; - - } - // p_id is jrn.jr_id - $p_id=$_GET["line"]; - echo_debug(__FILE__,__LINE__," action = update p_id = $p_id"); - $r ='
'; - $r.=UpdateJrn($cn,$p_id); - $r.=''; - $r.='
'; - echo '
'; - echo $r; - echo '
'; - } - -} -?> - -'; - foreach ( $HTTP_POST_VARS as $key=>$element) { - ${"p_$key"}=$element; - } - $p_MaxDeb+=2; - echo ""; - CorrectRecord($g_dossier,$g_user,$g_jrn,$p_MaxDeb,$p_MaxCred,$HTTP_POST_VARS); - echo_debug(__FILE__,__LINE__,"CorrectRecord($g_dossier,$g_user,$g_jrn,$p_MaxDeb,$p_MaxCred,$HTTP_POST_VARS);"); - } - - if ( isset ($_POST['add_line_cred']) ) { - echo '
'; - foreach ( $HTTP_POST_VARS as $key=>$element) { - ${"p_$key"}=$element; - } - $p_MaxCred+=2; - echo "
"; - CorrectRecord($g_dossier,$g_user,$g_jrn,$p_MaxDeb,$p_MaxCred,$HTTP_POST_VARS); - echo_debug(__FILE__,__LINE__,"CorrectRecord($g_dossier,$g_user,$g_jrn,$p_MaxDeb,$p_MaxCred+10,$HTTP_POST_VARS);"); - } - if ( isset ($_POST['viewsearch']) ) { - reset($HTTP_POST_VARS); - - echo '
'; - ShowMenuRecherche($g_dossier,$g_jrn,$HTTP_POST_VARS); - - ViewJrn($g_dossier,$g_user,$g_jrn,"enc_jrn.php",$HTTP_POST_VARS); - echo '
'; - - } - -if ( isset($_POST['add_record']) ) { - echo '
'; - foreach ( $HTTP_POST_VARS as $name=>$element ) { - echo_debug(__FILE__,__LINE__,"element $name -> $element "); - // Sauve les données dans des variables - ${"p_$name"}=$element; - } - $userPref=GetUserPeriode($cn,$g_user); - list ($l_date_start,$l_date_end)=GetPeriode($cn,$userPref); - - $p_op_date=$p_op_date.substr($l_date_start,2,8); - echo_debug(__FILE__,__LINE__,"p_op_date is $p_op_date"); - $aHttp=$HTTP_POST_VARS; - $aHttp['op_date']=$p_op_date; - // Verifie data - // $result=VerifData($cn,$HTTP_POST_VARS,$g_user); - $result=VerifData($cn,$aHttp,$g_user); - if ($result != NOERROR) { - // Parse result - AnalyzeError($result); - - echo "
"; - CorrectRecord($g_dossier,$g_user,$g_jrn,$p_MaxDeb,$p_MaxCred,$HTTP_POST_VARS); - return; - } - - $Res=StartSql($cn); - $seq=GetNextId($cn,'j_grpt')+1; - $s_op=GetNextId($cn,'j_id')+1; - - - $tot_cred=0; - $tot_deb=0; - - //debit - for ( $i = 0; $i < $p_MaxDeb; $i++) { - $montant=${"p_mont_deb$i"}; - $l_class=${"p_class_deb$i"}; - if ( strlen(trim($montant)) != 0 && $montant != 0) { - ${"p_text_deb$i"}=FormatString(GetPosteLibelle($g_dossier,$l_class)); - // $p_text=(FormatString(${"p_text_deb$i"})==null)?:FormatString(${"p_text_deb$i"}); - $Sql="insert into jrnx(j_id,j_date,j_montant,j_poste,j_grpt, - j_jrn_def,j_debit,j_tech_user,j_tech_per) - values ( $s_op,to_date('$p_op_date','DD.MM.YYYY'), " - .$montant.", - $l_class,$seq, - $g_jrn,true,'$g_user',$userPref)"; - echo_debug(__FILE__,__LINE__,"sql $Sql"); - $s_op++; - $tot_deb+=$montant; - $Res=ExecSql($cn,$Sql); - if ( $Res == false ) { Rollback($cn); EndSql($cn); return;} - // For the user profile we need the correct sequence id - AlterSequence($cn,'s_jrn_op',$s_op); - } - } - for ( $i = 0; $i < $p_MaxCred; $i++) { - $montant=${"p_mont_cred$i"}; - $l_class=${"p_class_cred$i"}; - if ( strlen(trim($montant)) != 0 && $montant != 0) { - //$p_text=(FormatString(${"p_text_cred$i"})==null)?FormatString(GetPosteLibelle($g_dossier,$l_class)):FormatString(${"p_text_cred$i"}); - ${"p_text_cred$i"}=FormatString(GetPosteLibelle($g_dossier,$l_class)); - $Sql="insert into jrnx(j_id,j_date,j_montant,j_poste,j_grpt, - j_jrn_def,j_debit,j_tech_user,j_tech_per) - values ( $s_op,to_date('$p_op_date','DD.MM.YYYY'), $montant, - $l_class,$seq, - $g_jrn,false,'$g_user',$userPref)"; - echo_debug(__FILE__,__LINE__,"sql $Sql"); - $s_op++; - $tot_cred+=$montant; - $Res=ExecSql($cn,$Sql); - if ( $Res == false ) { Rollback($cn); EndSql($cn); break;} - // For the user profile we need the correct sequence id - AlterSequence($cn,'s_jrn_op',$s_op); - - } - } - - - - - $jrn_id=GetNextJrnId($cn,'jr_id')+1; - if ( ! isset ($p_ech) ) $p_ech=""; - $l_date=isDate($p_ech); - if ( $l_date == null) { - $p_ech='null'; - } else { - $p_ech="to_char('".$l_date."','DD.MM.YYYY')"; - } - $comment=FormatString($p_comment); - - $Sql=sprintf("insert into jrn(jr_id,jr_def_id,jr_comment,jr_date,jr_grpt_id, - jr_montant,jr_tech_per) values(%s,%s,'%s',%s,%d,%f,%d)", - $jrn_id, - $g_jrn, - $comment, - $p_ech, - $seq,$tot_deb,$userPref); - echo_debug(__FILE__,__LINE__,"Sql $Sql"); - $Res=ExecSql($cn,$Sql); - if ($Res) - SetInternalCode($cn,$seq,$g_jrn); - if ( isset ($p_rapt)) InsertRapt($cn,$jrn_id,$p_rapt); - - - if ( $Res) { - Commit($cn); - EndSql($cn); - - // For the user profile we need the correct sequence id - AlterSequence($cn,'s_jrn',$jrn_id); - // AlterSequence($cn,"s_grpt",$seq+1); - //AlterSequence($cn,"s_jrn_op",$s_op); - // Add the p_text to the array - - ViewRecord($g_dossier,$g_jrn,$seq,$p_MaxDeb,$p_MaxCred,$aHttp); - // echo_debug(__FILE__,__LINE__,"ViewRecord($g_dossier,$g_jrn,$seq,$p_MaxDeb,$p_MaxCred,$HTTP_POST_VARS);"); - echo_debug(__FILE__,__LINE__,"ViewRecord($g_dossier,$g_jrn,$seq,$p_MaxDeb,$p_MaxCred,$aHttp);"); - } else - { - Rollback($cn); - EndSql($cn); - } -} // _POST['add_record'] - -if ( isset($_POST['update_record']) ) { - // NO UPDATE except rapt & comment - UpdateComment($cn,$_POST['jr_id'],$_POST['comment']); - InsertRapt($cn,$_POST['jr_id'],$_POST['rapt']); - echo '
'; - ViewJrn($g_dossier,$g_user,$g_jrn,"enc_jrn.php"); - echo '
'; - -} // if update_record - -?> - - diff --git a/html/facturation.php b/html/facturation.php index 60e02349b..e7557199a 100644 --- a/html/facturation.php +++ b/html/facturation.php @@ -30,7 +30,7 @@ $rep=DbConnect(); include_once ("class_user.php"); $User=new cl_user($rep); $User->Check(); -include ("top_menu_compta.php"); +include ("user_menu.php"); ShowMenuCompta($g_dossier,$g_UserProperty); if ( $g_UserProperty['use_admin']==0 ) { diff --git a/html/fiche.php b/html/fiche.php index 0f129e86c..466de6335 100644 --- a/html/fiche.php +++ b/html/fiche.php @@ -28,7 +28,7 @@ if ( ! isset ( $_SESSION['g_dossier'] ) ) { exit -2; } include_once ("postgres.php"); -include_once ("top_menu_compta.php"); +include_once ("user_menu.php"); echo JS_SEARCH_POSTE; $rep=DbConnect(); diff --git a/html/form.php b/html/form.php index d634c6d49..913cd86b6 100644 --- a/html/form.php +++ b/html/form.php @@ -36,7 +36,7 @@ $User->Check(); include_once("form_inc.php"); -include_once ("top_menu_compta.php"); +include_once ("user_menu.php"); ShowMenuCompta($g_dossier,$g_UserProperty); include ("check_priv.php"); diff --git a/html/jrn_add.php b/html/jrn_add.php index a6dae4c2a..d2905176b 100644 --- a/html/jrn_add.php +++ b/html/jrn_add.php @@ -33,7 +33,7 @@ include_once ("class_user.php"); $User=new cl_user($rep); $User->Check(); include_once("check_priv.php"); -include_once ("top_menu_compta.php"); +include_once ("user_menu.php"); ShowMenuCompta($_SESSION['g_dossier']); @@ -105,7 +105,7 @@ echo_debug(__FILE__,__LINE__,"nom journal $p_jrn_name"); $Res=ExecSql($cn,$Sql); } } -ShowMenuJrn($_SESSION['g_dossier']); +MenuJrn($_SESSION['g_dossier']); if ( isset ($_GET["PHPSESSID"]) ) { $sessid=$_GET["PHPSESSID"]; }else { diff --git a/html/jrn_detail.php b/html/jrn_detail.php index c17cfe1cb..4cf0be75a 100644 --- a/html/jrn_detail.php +++ b/html/jrn_detail.php @@ -31,7 +31,8 @@ include_once ("class_user.php"); $User=new cl_user($rep); $User->Check(); -include_once ("top_menu_compta.php"); +//include_once ("top_menu_compta.php"); +include_once ("user_menu.php"); ShowMenuCompta($_SESSION['g_dossier']); include_once("check_priv.php"); @@ -50,8 +51,8 @@ if ( $_SESSION['use_admin'] == 0 ) { // Javascript echo JS_SEARCH_POSTE; if ( isset( $_GET['p_jrn'] )) { - $g_jrn=$p_jrn; - $_SESSION["g_jrn"]=$p_jrn; + $g_jrn=$_GET['p_jrn']; + $_SESSION["g_jrn"]=$g_jrn; } @@ -107,7 +108,7 @@ If ( isset ($_POST["JRN_UPD"] )) { $Res=ExecSql($cn,$Sql); } } -ShowMenuJrn($_SESSION['g_dossier']); +MenuJrn($_SESSION['g_dossier']); $Res=ExecSql($cn,"select jrn_def_name,jrn_def_class_deb,jrn_def_class_cred,". "jrn_deb_max_line,jrn_cred_max_line,jrn_def_code". diff --git a/html/jrn_update.php b/html/jrn_update.php index 1d6b8a75f..505a0c25e 100644 --- a/html/jrn_update.php +++ b/html/jrn_update.php @@ -34,7 +34,7 @@ $User->Check(); include_once ("check_priv.php"); -include_once ("top_menu_compta.php"); +include_once ("user_menu.php"); ShowMenuCompta($_SESSION['g_dossier']); if ( $User->admin == 0 ) { @@ -47,7 +47,7 @@ if ( $User->admin == 0 ) { } } -ShowMenuJrn($_SESSION['g_dossier']); +MenuJrn($_SESSION['g_dossier']); $cn=DbConnect($_SESSION['g_dossier']); echo '
'; diff --git a/html/line_update.php b/html/line_update.php index f7efb8a2d..8935c2c17 100644 --- a/html/line_update.php +++ b/html/line_update.php @@ -45,7 +45,7 @@ if ( $User->admin == 0 ) { } -include ("top_menu_compta.php"); +include ("user_menu.php"); ShowMenuComptaRight($_SESSION['g_dossier'],$User->admin); $l_Db=sprintf("dossier%d",$_SESSION['g_dossier']); echo '
'; @@ -55,6 +55,10 @@ echo '
'; Numéro de classe ',$l); echo ""; printf('',urldecode($n)); diff --git a/html/pcmn_update.php b/html/pcmn_update.php index 81ba968fe..a80248b38 100644 --- a/html/pcmn_update.php +++ b/html/pcmn_update.php @@ -33,7 +33,7 @@ $User=new cl_user($rep); $User->Check(); -include_once ("top_menu_compta.php"); +include_once ("user_menu.php"); include_once ("check_priv.php"); ShowMenuCompta($_SESSION['g_dossier']); diff --git a/html/recherche.php b/html/recherche.php index 5c7460293..71ee904b4 100644 --- a/html/recherche.php +++ b/html/recherche.php @@ -19,7 +19,7 @@ /* $Revision$ */ // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr include_once("ac_common.php"); -include("top_menu_compta.php"); +include("user_menu.php"); include_once ("constant.php"); include_once("jrn.php"); include_once("user_common.php"); diff --git a/html/stock.php b/html/stock.php index 49693429a..fcba5fb7f 100644 --- a/html/stock.php +++ b/html/stock.php @@ -56,7 +56,7 @@ $cn=DbConnect($_SESSION['g_dossier']); //Show the top menu include_once ("user_menu.php"); -include_once ("top_menu_compta.php"); + ShowMenuCompta($_SESSION['g_dossier']); // Show Menu Left diff --git a/html/user_advanced.php b/html/user_advanced.php index 354dfe46b..61e726070 100644 --- a/html/user_advanced.php +++ b/html/user_advanced.php @@ -49,7 +49,7 @@ $User->Check(); // Show the top menus include_once ("user_menu.php"); -include_once ("top_menu_compta.php"); + ShowMenuCompta($_SESSION['g_dossier']); // Show the right menus diff --git a/html/user_compta.php b/html/user_compta.php index 540969438..02b842da3 100644 --- a/html/user_compta.php +++ b/html/user_compta.php @@ -59,7 +59,7 @@ if ( $User->admin == 0 ) { include_once ("user_menu.php"); -include_once ("top_menu_compta.php"); + ShowMenuCompta($g_dossier); html_page_stop(); diff --git a/html/user_impress.php b/html/user_impress.php index 721037091..a55fe00bd 100644 --- a/html/user_impress.php +++ b/html/user_impress.php @@ -34,7 +34,7 @@ $User=new cl_user($cn); $User->Check(); include ("check_priv.php"); -include_once ("top_menu_compta.php"); +include_once ("user_menu.php"); ShowMenuCompta($_SESSION['g_dossier']); // show sub menu diff --git a/html/user_jrn.php b/html/user_jrn.php index 762fcf37c..18d5a7e46 100644 --- a/html/user_jrn.php +++ b/html/user_jrn.php @@ -19,7 +19,7 @@ // Copyright Author Dany De Bontridder ddebontridder@yahoo.fr /* $Revision$ */ include_once("ac_common.php"); -include("top_menu_compta.php"); +include_once("user_menu.php"); include_once ("constant.php"); include_once ("postgres.php"); include_once ("check_priv.php"); @@ -86,6 +86,7 @@ if ( isset ($_GET['JRN_TYPE'] ) ) { ShowMenuJrnUser($_SESSION['g_dossier'],$_GET['JRN_TYPE'],$_SESSION['g_jrn']); echo ""; if ( $jrn_type=='NONE' ) include('user_action_gl.php'); + if ( $jrn_type=='SALDO_FIN') include ('user_action_fin.php'); } else { @@ -112,8 +113,8 @@ if ( $_SESSION['g_jrn'] != -1 ) { $JrnProp=GetJrnProp($_SESSION['g_dossier'],$_SESSION['g_jrn']); $jrn_type=$JrnProp['jrn_def_type']; // display jrn's menu - include_once('user_menu.php'); - $menu_jrn=u_ShowMenuJrn($cn,$jrn_type); + + $menu_jrn=ShowMenuJrn($cn,$jrn_type); // echo '
'; // echo $result; echo $menu_jrn; diff --git a/html/user_pref.php b/html/user_pref.php index e3bc597fe..07a8ddd77 100644 --- a/html/user_pref.php +++ b/html/user_pref.php @@ -43,7 +43,7 @@ html_page_start($_SESSION['use_theme']); // show the top menu depending of the use_style // comta style -include_once ("top_menu_compta.php"); +include_once ("user_menu.php"); if ( isset ($_SESSION['g_dossier']) ) { if ( $_SESSION['g_dossier'] != 0 ) ShowMenuCompta($_SESSION['g_dossier']); diff --git a/html/user_sec.php b/html/user_sec.php index 5e7f95eb9..4ab7394e5 100644 --- a/html/user_sec.php +++ b/html/user_sec.php @@ -33,7 +33,7 @@ include_once ("class_user.php"); $User=new cl_user($rep); $User->Check(); -include_once ("top_menu_compta.php"); +include_once ("user_menu.php"); ShowMenuCompta($_SESSION['g_dossier']); if ( $User->admin== 0 ) { diff --git a/include/user_menu.php b/include/user_menu.php index 942cea701..2792092e1 100644 --- a/include/user_menu.php +++ b/include/user_menu.php @@ -156,7 +156,7 @@ function GetAvailableFolder($p_user,$p_admin) * * gen : none */ -function u_ShowMenuCompta($p_dossier) +function ShowMenuCompta($p_dossier) { include_once("postgres.php"); $l_name=GetDossierName($p_dossier); @@ -196,7 +196,7 @@ function u_ShowMenuCompta($p_dossier) * - string containing the html menu * */ -function u_ShowMenuComptaRight($p_dossier=0,$p_admin=0) +function ShowMenuComptaRight($p_dossier=0,$p_admin=0) { include_once("ac_common.php"); $i=0; @@ -212,7 +212,7 @@ function u_ShowMenuComptaRight($p_dossier=0,$p_admin=0) echo '
'; } -/* function u_ShowMenuJrnUser($p_dossier,$p_user) +/* function ShowMenuJrnUser($p_dossier,$p_user) * Purpose : Show the Menu from the jrn encode * page * @@ -228,7 +228,7 @@ function u_ShowMenuComptaRight($p_dossier=0,$p_admin=0) * */ -function u_ShowMenuJrnUser($p_dossier,$p_type,$p_jrn) +function ShowMenuJrnUser($p_dossier,$p_type,$p_jrn) { include_once ("debug.php"); include_once("constant.php"); @@ -272,6 +272,10 @@ function u_ShowMenuJrnUser($p_dossier,$p_type,$p_jrn) $right=3; } + // Show saldo +// echo ''); +// echo ''; if ( $right > 0 ) { // Minimum Lecture @@ -307,7 +311,7 @@ function u_ShowMenuJrnUser($p_dossier,$p_type,$p_jrn) * return: * - string containing the menu */ -function u_ShowMenuJrn($p_cn,$p_jrn_type) +function ShowMenuJrn($p_cn,$p_jrn_type) { $Res=ExecSql($p_cn,"select ja_name,ja_url,ja_action,ja_desc from jrn_action where ja_jrn_type='$p_jrn_type' @@ -570,4 +574,88 @@ function MenuAdmin() $menu=ShowItem($item,'H'); return $menu; } +/* function + * Purpose : + * + * parm : + * - + * gen : + * - + * return: + * - + * + */ +function ShowMenuParam() +{ + $sub_menu=ShowItem(array( + //('rapprt.php','Rapprochement'), + array('dossier_prefs.php?p_action=devise','Devises'), + array('dossier_prefs.php?p_action=periode','Période'), + array('user_sec.php','Sécurité') + ), + 'H',"cell","mtitle"); + return $sub_menu; + +} +/* function MenuJrn($p_dossier) + * Purpose : Show the menu in the jrn page + * + * parm : + * - $p_dossier + * gen : + * - none + * return: + * - none + * + */ + +function MenuJrn($p_dossier) +{ + echo '
'; + echo '
Libellé '; +// echo ('Solde
'; + echo ''; + include_once("postgres.php"); + $Cn=DbConnect($p_dossier); + $Ret=ExecSql($Cn,"select jrn_def_id,jrn_def_name, + jrn_def_class_deb,jrn_def_class_cred,jrn_type_id,jrn_desc + from jrn_def join jrn_type on jrn_def_type=jrn_type_id"); + $Max=pg_NumRows($Ret); + for ($i=0;$i<$Max;$i++) { + $l_line=pg_fetch_array($Ret,$i); + printf ('', + $l_line['jrn_def_id'],$l_line['jrn_def_name']); + + } + echo "
Création
%s
"; + echo '
'; + +} +/* function ShowMenuPcmn($p_start=1) + * Purpose : Show the menu from the pcmn page + * + * parm : + * - $p_start class start + * gen : + * - none + * return: + * - none + * + */ + +function ShowMenuPcmn($p_start=1) +{ + echo '
'; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo "
1 Immobilisé
2 Actif a un an au plus
3 Stock et commande
4 Compte tiers
5 Actif
6 Charges
7 Produits
"; + echo '
'; + +} + ?>