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

[phpcompta-dev]

Author: danydb
Date: 2011-10-25 23:03:53 +0200 (Tue, 25 Oct 2011)
New Revision: 4232

Modified:
   phpcompta/branches/rel600-dynamic-menu/html/do.php
   phpcompta/branches/rel600-dynamic-menu/include/class_acc_ledger.php
   phpcompta/branches/rel600-dynamic-menu/include/compta_fin.inc.php
Log:
#241 : modularity for FINANCIAL ledger


Modified: phpcompta/branches/rel600-dynamic-menu/html/do.php
===================================================================
--- phpcompta/branches/rel600-dynamic-menu/html/do.php  2011-10-24 20:47:02 UTC 
(rev 4231)
+++ phpcompta/branches/rel600-dynamic-menu/html/do.php  2011-10-25 21:03:53 UTC 
(rev 4232)
@@ -30,7 +30,7 @@
 require_once('ac_common.php');
 require_once 'function_javascript.php';
 html_page_start();
-global $g_user;
+global $g_user,$cn;
 
 $cn=new Database(Dossier::id());
 $g_user=new User($cn);

Modified: phpcompta/branches/rel600-dynamic-menu/include/class_acc_ledger.php
===================================================================
--- phpcompta/branches/rel600-dynamic-menu/include/class_acc_ledger.php 
2011-10-24 20:47:02 UTC (rev 4231)
+++ phpcompta/branches/rel600-dynamic-menu/include/class_acc_ledger.php 
2011-10-25 21:03:53 UTC (rev 4232)
@@ -2322,10 +2322,10 @@
 
         $and='';
         $user=new User($this->db);
-
+       $p_action=$ledger_type;
         if ( $r_jrn == -1 )
         {
-           $p_action=$ledger_type;
+
             /* Specific action allow to see all the ledgers in once */
            if ( $ledger_type== 'gl') $p_action='ALL';
             /* actions from commercial.php  */

Modified: phpcompta/branches/rel600-dynamic-menu/include/compta_fin.inc.php
===================================================================
--- phpcompta/branches/rel600-dynamic-menu/include/compta_fin.inc.php   
2011-10-24 20:47:02 UTC (rev 4231)
+++ phpcompta/branches/rel600-dynamic-menu/include/compta_fin.inc.php   
2011-10-25 21:03:53 UTC (rev 4232)
@@ -28,17 +28,15 @@
 global $g_user;
 
 $gDossier=dossier::id();
-$p_action=(isset ($_REQUEST['p_action']))?$_REQUEST['p_action']:'';
 
 
 $cn=new Database(dossier::id());
-$menu_action="?p_action=fin&".dossier::get();
+$menu_action="?ledger_type=fin&ac=".$_REQUEST['ac']."&".dossier::get();
 $menu=array(
           array($menu_action.'&sa=n',_('Nouvel extrait'),_('Encodage d\'un 
nouvel extrait'),1),
           array($menu_action.'&sa=l',_('Liste'),_('Liste opération 
bancaire'),2),
           array($menu_action.'&sa=s',_('Solde'),_('Solde des comptes'),3),
-          array($menu_action.'&sa=r',_('Rapprochements 
banquaires'),_('Rapprochements banquaires'),4),
-          
array('?p_action=impress&type=jrn&'.dossier::get(),_('Impression'),_('Impression'))
+          array($menu_action.'&sa=r',_('Rapprochements 
banquaires'),_('Rapprochements banquaires'),4)
           );
 $sa=(isset($_REQUEST['sa']))?$_REQUEST['sa']:-1;
 
@@ -72,8 +70,6 @@
 if ( $def == 1 )
 {
 
-    $href=basename($_SERVER['PHP_SELF']);
-
     if ( isset($_REQUEST['p_jrn']))
         $Ledger->id=$_REQUEST['p_jrn'];
     else
@@ -107,7 +103,7 @@
         {
             echo '<div class="content">';
             echo '<form name="form_detail" class="print" 
enctype="multipart/form-data" ACTION="'.$href.'" METHOD="POST">';
-            echo HtmlInput::hidden('p_action','fin');
+            echo HtmlInput::hidden('ac',$_REQUEST['ac']);
             echo $Ledger->confirm($_POST);
             echo HtmlInput::submit('confirm',_('Confirmer'));
             echo HtmlInput::submit('correct',_('Corriger'));
@@ -140,7 +136,7 @@
             echo $a;
             echo '</div>';
             echo '<div class="content">';
-            echo HtmlInput::button_anchor(_('Nouvel 
extrait'),$href.'?p_action=fin&sa=n&'.dossier::get());
+            echo HtmlInput::button_anchor(_('Nouvel 
extrait'),$href.'?ledger_type=fin&sa=n&'.dossier::get()."&ac=".$_REQUEST['ac']);
             echo '</div>';
             exit();
         }
@@ -159,8 +155,9 @@
 
 
     echo '<form class="print" name="form_detail" enctype="multipart/form-data" 
ACTION="'.$href.'" METHOD="POST">';
-    echo HtmlInput::hidden('p_action','fin');
+    echo HtmlInput::hidden('ledger_type','fin');
     echo HtmlInput::hidden('sa','n');
+      echo HtmlInput::hidden('ac',$_REQUEST['ac']);
     $array=( isset($correct))?$_POST:null;
     // show select ledger
     echo $Ledger->input($array);
@@ -208,7 +205,6 @@
     $bar=jrn_navigation_bar($offset,$max_line,$step,$page);
 
     echo HtmlInput::hidden("sa","lnp");
-    echo HtmlInput::hidden("p_action","ach");
     echo dossier::hidden();
     echo $bar;
     list($count,$html)= $Ledger->list_operation($sql,$offset);
@@ -217,7 +213,7 @@
    /*
      * Export to csv
      */
-    
$r=HtmlInput::get_to_hidden(array('l','date_start','date_end','desc','amount_min','amount_max','qcode','accounting','unpaid','gDossier','ledger_type','p_action'));
+    
$r=HtmlInput::get_to_hidden(array('l','ac','date_start','date_end','desc','amount_min','amount_max','qcode','accounting','unpaid','gDossier','ledger_type','p_action'));
     if (isset($_GET['r_jrn'])) {
       foreach ($_GET['r_jrn'] as $k=>$v)
        $r.=HtmlInput::hidden('r_jrn['.$k.']',$v);
@@ -353,7 +349,7 @@
     //-------------------------
     echo '<div class="content">';
     echo '<form method="get">';
-    echo HtmlInput::get_to_hidden(array('gDossier','p_action','sa'));
+    echo HtmlInput::get_to_hidden(array('gDossier','ledger_type','ac','sa'));
     $wLedger=$Ledger->select_ledger('FIN',3);
     if ($wLedger == null ) exit ('Pas de journal disponible');