[Phpcompta-dev] r4239 - in phpcompta/branches/rel600-dynamic-menu: html include

[phpcompta-dev]

Author: danydb
Date: 2011-10-27 21:40:42 +0200 (Thu, 27 Oct 2011)
New Revision: 4239

Modified:
   phpcompta/branches/rel600-dynamic-menu/html/compta.php
   phpcompta/branches/rel600-dynamic-menu/include/opening.inc.php
   phpcompta/branches/rel600-dynamic-menu/include/preod.inc.php
   phpcompta/branches/rel600-dynamic-menu/include/stock.inc.php
Log:
#241 : modularity : old user_advanced.php



Modified: phpcompta/branches/rel600-dynamic-menu/html/compta.php
===================================================================
--- phpcompta/branches/rel600-dynamic-menu/html/compta.php      2011-10-27 
19:10:19 UTC (rev 4238)
+++ phpcompta/branches/rel600-dynamic-menu/html/compta.php      2011-10-27 
19:40:42 UTC (rev 4239)
@@ -80,7 +80,7 @@
 }
 if ( $action=='quick_writing')
 {
-    require_once ('compta_ods.inc.php');
+    require_once 'compta_ods.inc.php';
 }
 if ( $action == 'gl' )
 {

Modified: phpcompta/branches/rel600-dynamic-menu/include/opening.inc.php
===================================================================
--- phpcompta/branches/rel600-dynamic-menu/include/opening.inc.php      
2011-10-27 19:10:19 UTC (rev 4238)
+++ phpcompta/branches/rel600-dynamic-menu/include/opening.inc.php      
2011-10-27 19:40:42 UTC (rev 4239)
@@ -19,7 +19,7 @@
 /* $Revision$ */
 
 // Copyright Author Dany De Bontridder address@hidden
-
+require_once 'user_menu.php';
 /*!\file
  * \brief The opening of the exercices. it takes the saldo of the
  * choosen foolder / exercice and import it as a misc operation in the
@@ -48,7 +48,7 @@
         exit();
     }
     echo '<form class="print" method="post">';
-    echo HtmlInput::hidden('p_action','ouv');
+    echo HtmlInput::hidden('ac',$_REQUEST['ac']);
     echo HtmlInput::hidden('sa','step2');
     echo dossier::hidden();
     $wAvail=new ISelect();
@@ -74,7 +74,7 @@
 /* --------------------------------------------------
  * Step 2 choose now the exercice of this folder
  */
-$back='user_advanced.php?p_action=ouv&'.dossier::get();
+$back='do.php?ac='.$_REQUEST['ac'].'&'.dossier::get();
 if ( $sa=='step2')
 {
     echo '<div class="content">'.
@@ -83,7 +83,7 @@
     '<form class="print" method="post">'.
     ' Choississez l\'exercice du dossier ';
     echo dossier::hidden();
-    echo HtmlInput::hidden('p_action','ouv');
+     echo HtmlInput::hidden('ac',$_REQUEST['ac']);
     echo HtmlInput::hidden('sa','step3');
     echo HtmlInput::hidden('f',$_REQUEST['f']);
     $cn=new Database($_REQUEST['f']);
@@ -131,9 +131,10 @@
     $wLedger->value=$array;
     echo $wLedger->input('p_jrn');
     echo HtmlInput::submit('ok','Continuer');
+     echo HtmlInput::hidden('ac',$_REQUEST['ac']);
     echo dossier::hidden();
     echo "</form>";
-    echo HtmlInput::button_anchor('Retour',$back);
+    echo 
HtmlInput::button_anchor('Retour',$back.'&sa=step2&f='.$_REQUEST['f']);
     exit(0);
 
 }
@@ -171,8 +172,9 @@
     $cn=new Database(dossier::id());
     $User=new User($cn);
     $jrn=new Acc_Ledger($cn,$_REQUEST['p_jrn']);
-    echo '<form class="print" method="post" action="compta.php">';
-    echo HtmlInput::hidden('p_action','quick_writing');
+    echo '<form class="print" method="post" action="do.php">';
+    echo HtmlInput::hidden('ac',$_REQUEST['ac']);
+    echo HtmlInput::hidden('sa','step5');
     echo dossier::hidden();
     echo HtmlInput::hidden('p_jrn',$_REQUEST['p_jrn']);
     echo $jrn->show_form($result,0);
@@ -184,3 +186,13 @@
 
     echo '</div>';
 }
+// if sa=step4 then record it
+//
+/*
+ * @todo finir les ouvertures d'année
+ */
+if ( $_REQUEST['sa']=='step5')
+{
+    echo "<h2> A ENREGISTRER</H2>";
+
+}

Modified: phpcompta/branches/rel600-dynamic-menu/include/preod.inc.php
===================================================================
--- phpcompta/branches/rel600-dynamic-menu/include/preod.inc.php        
2011-10-27 19:10:19 UTC (rev 4238)
+++ phpcompta/branches/rel600-dynamic-menu/include/preod.inc.php        
2011-10-27 19:40:42 UTC (rev 4239)
@@ -45,7 +45,7 @@
 echo dossier::hidden();
 $hid=new IHidden();
 echo $hid->input("sa","jrn");
-echo $hid->input("p_action","preod");
+echo $hid->input("ac",$_REQUEST['ac']);
 echo '<hr>';
 echo HtmlInput::submit('Accepter','Accepter');
 echo '</form>';
@@ -96,7 +96,7 @@
        echo '<form method="POST" style="margin:0;padding:0">';
         echo dossier::hidden();
         echo $hid->input("sa","del");
-        echo $hid->input("p_action","preod");
+        echo $hid->input("ac",$_REQUEST['ac']);
         echo $hid->input("del","");
         echo $hid->input("od_id",$row['od_id']);
         echo $hid->input("jrn",$_GET['jrn']);

Modified: phpcompta/branches/rel600-dynamic-menu/include/stock.inc.php
===================================================================
--- phpcompta/branches/rel600-dynamic-menu/include/stock.inc.php        
2011-10-27 19:10:19 UTC (rev 4238)
+++ phpcompta/branches/rel600-dynamic-menu/include/stock.inc.php        
2011-10-27 19:40:42 UTC (rev 4239)
@@ -37,12 +37,12 @@
 
 $cn=new Database($gDossier);
 include_once ("class_user.php");
-global $User;
+global $g_user;
 
 $href=basename($_SERVER['PHP_SELF']);
 
 // Get The priv on the selected folder
-$User->can_request(STOLE,1);
+$g_user->can_request(STOLE,1);
 
 
 $action= ( isset ($_GET['action']))? $_GET['action']:"";
@@ -51,7 +51,7 @@
 // Adjust the stock
 if ( isset ($_POST['sub_change']))
 {
-    $User->can_request(STOWRITE,1);
+    $g_user->can_request(STOWRITE,1);
     $change=$_POST['stock_change'];
     $sg_code=$_POST['sg_code'];
     $sg_date=$_POST['sg_date'];
@@ -69,7 +69,7 @@
     else
     {
         // Check if User Can change the stock
-        if ( $User->check_action($gDossier,GESTOCK) == 0 )
+        if ( $g_user->check_action($gDossier,GESTOCK) == 0 )
         {
             NoAccess();
             exit (-1);
@@ -113,7 +113,7 @@
 if ( ! isset ($_GET['year']) )
 {
     // get defaut periode
-    $a=$User->get_periode();
+    $a=$g_user->get_periode();
     // get exercice of periode
     $periode=new Periode($cn,$a);
     $year=$periode->get_exercice();
@@ -128,11 +128,11 @@
 if ( $action == 'detail' )
 {
     // Check if User Can see the stock
-    $User->can_request(STOLE,1);
+    $g_user->can_request(STOLE,1);
     $sg_code=(isset ($_GET['sg_code'] ))?$_GET['sg_code']:$_POST['sg_code'];
     $year=(isset($_GET['year']))?$_GET['year']:$_POST['year'];
     $a=ViewDetailStock($cn,$sg_code,$year);
-    $write=$User->check_action(STOWRITE);
+    $write=$g_user->check_action(STOWRITE);
 
     $b="";