[Phpcompta-dev] r4299 - phpcompta/trunk/include

[phpcompta-dev]

Author: danydb
Date: 2011-11-02 22:46:21 +0100 (Wed, 02 Nov 2011)
New Revision: 4299

Modified:
   phpcompta/trunk/include/compta_ach.inc.php
Log:
Finish rewriting for ACH remove dead code

Modified: phpcompta/trunk/include/compta_ach.inc.php
===================================================================
--- phpcompta/trunk/include/compta_ach.inc.php  2011-11-02 21:45:11 UTC (rev 
4298)
+++ phpcompta/trunk/include/compta_ach.inc.php  2011-11-02 21:46:21 UTC (rev 
4299)
@@ -1,4 +1,5 @@
 <?php
+
 /*
  *   This file is part of PhpCompta.
  *
@@ -15,293 +16,217 @@
  *   You should have received a copy of the GNU General Public License
  *   along with PhpCompta; if not, write to the Free Software
  *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-*/
+ */
 /* $Revision$ */
 
 // Copyright Author Dany De Bontridder address@hidden
 
-/*!\file
+/* !\file
  * \brief file included to manage all the sold operation
  */
 require_once("class_icheckbox.php");
 require_once("class_acc_ledger_purchase.php");
 require_once ('class_pre_op_ach.php');
 require_once('class_ipopup.php');
-$gDossier=dossier::id();
+$gDossier = dossier::id();
 
-$cn=new Database(dossier::id());
+$cn = new Database(dossier::id());
 //menu = show a list of ledger
-$str_dossier=dossier::get();
-$ac="ac=".$_REQUEST['ac'];
+$str_dossier = dossier::get();
+$ac = "ac=" . $_REQUEST['ac'];
 
 // Check privilege
-    if ( isset($_REQUEST['p_jrn']))
-        if (     $g_user->check_jrn($_REQUEST['p_jrn']) != 'W' )
-        {
-            NoAccess();
-            exit -1;
-        }
+if (isset($_REQUEST['p_jrn']))
+       if ($g_user->check_jrn($_REQUEST['p_jrn']) != 'W')
+       {
+               NoAccess();
+               exit - 1;
+       }
 
-    /* if a new invoice is encoded, we display a form for confirmation */
-    if ( isset ($_POST['view_invoice'] ) )
-    {
-        $Ledger=new Acc_Ledger_Purchase($cn,$_POST['p_jrn']);
-        try
-        {
-            $Ledger->verify($_POST);
-        }
-        catch (Exception $e)
-        {
-            alert($e->getMessage());
-            $correct=1;
-        }
-        // if correct is not set it means it is correct
-        if ( ! isset($correct))
-        {
-            echo '<div class="content">';
-                       echo h2info('Confirmation');
-                       echo '<h2 id="jrn_name">'.$Ledger->get_name().'</h2>';
+/* if a new invoice is encoded, we display a form for confirmation */
+if (isset($_POST['view_invoice']))
+{
+       $Ledger = new Acc_Ledger_Purchase($cn, $_POST['p_jrn']);
+       try
+       {
+               $Ledger->verify($_POST);
+       }
+       catch (Exception $e)
+       {
+               alert($e->getMessage());
+               $correct = 1;
+       }
+       // if correct is not set it means it is correct
+       if (!isset($correct))
+       {
+               echo '<div class="content">';
+               echo h2info('Confirmation');
+               echo '<h2 id="jrn_name">' . $Ledger->get_name() . '</h2>';
 
-            echo '<form enctype="multipart/form-data" method="post">';
-            echo dossier::hidden();
+               echo '<form enctype="multipart/form-data" method="post">';
+               echo dossier::hidden();
 
-            echo $Ledger->confirm($_POST );
-                       echo HtmlInput::hidden('ac',$_REQUEST['ac']);
-            $chk=new ICheckBox();
-            $chk->selected=false;
-           echo '<div style="float:left;clear:both">';
+               echo $Ledger->confirm($_POST);
+               echo HtmlInput::hidden('ac', $_REQUEST['ac']);
+               $chk = new ICheckBox();
+               $chk->selected = false;
+               echo '<div style="float:left;clear:both">';
 
-            echo $chk->input('opd_save');
-            echo "Sauvez cette op&eacute;ration comme modèle d'opération ?";
-           echo '<br/>';
-           $opd_name=new IText('opd_name');
-           echo "Nom du modèle ".$opd_name->input();
+               echo $chk->input('opd_save');
+               echo "Sauvez cette op&eacute;ration comme modèle d'opération ?";
+               echo '<br/>';
+               $opd_name = new IText('opd_name');
+               echo "Nom du modèle " . $opd_name->input();
 
-            echo '<hr>';
-            echo 
HtmlInput::submit("record",_("Enregistrement"),'onClick="return 
verify_ca(\'\');"');
-            echo HtmlInput::submit('correct',_("Corriger"));
-            echo '</form>';
-           echo '</div>';
-            echo '</div>';
+               echo '<hr>';
+               echo HtmlInput::submit("record", _("Enregistrement"), 
'onClick="return verify_ca(\'\');"');
+               echo HtmlInput::submit('correct', _("Corriger"));
+               echo '</form>';
+               echo '</div>';
+               echo '</div>';
 
-            exit();
-        }
-    }
-    //------------------------------
-    /* Record the invoice */
-    //------------------------------
+               exit();
+       }
+}
+//------------------------------
+/* Record the invoice */
+//------------------------------
 
-    if ( isset($_POST['record']) )
-    {
-        $Ledger=new Acc_Ledger_Purchase($cn,$_POST['p_jrn']);
-        try
-        {
-            $Ledger->verify($_POST);
-        }
-        catch (Exception $e)
-        {
-            alert($e->getMessage());
-            $correct=1;
-        }
-               // record the invoice
-        if ( ! isset($correct))
-        {
-            echo '<div class="content">';
+if (isset($_POST['record']))
+{
+       $Ledger = new Acc_Ledger_Purchase($cn, $_POST['p_jrn']);
+       try
+       {
+               $Ledger->verify($_POST);
+       }
+       catch (Exception $e)
+       {
+               alert($e->getMessage());
+               $correct = 1;
+       }
+       // record the invoice
+       if (!isset($correct))
+       {
+               echo '<div class="content">';
 
-                       echo '<h2 id="jrn_name">'.$Ledger->get_name().'</h2>';
+               echo '<h2 id="jrn_name">' . $Ledger->get_name() . '</h2>';
 
-            $Ledger=new Acc_Ledger_Purchase($cn,$_POST['p_jrn']);
-            $internal=$Ledger->insert($_POST);
+               $Ledger = new Acc_Ledger_Purchase($cn, $_POST['p_jrn']);
+               $internal = $Ledger->insert($_POST);
 
 
-            /* Save the predefined operation */
-            if ( isset($_POST['opd_save']) && 
$g_user->check_action(PARPREDE)==1)
-            {
-                $opd=new Pre_op_ach($cn);
-                $opd->get_post();
-                $opd->save();
-            }
+               /* Save the predefined operation */
+               if (isset($_POST['opd_save']) && 
$g_user->check_action(PARPREDE) == 1)
+               {
+                       $opd = new Pre_op_ach($cn);
+                       $opd->get_post();
+                       $opd->save();
+               }
 
-            /* Show button  */
-            $jr_id=$cn->get_value('select jr_id from jrn where 
jr_internal=$1',array($internal));
+               /* Show button  */
+               $jr_id = $cn->get_value('select jr_id from jrn where 
jr_internal=$1', array($internal));
 
-            echo '<h2 class="info"> Enregistrement </h2>';
-            echo "<h2 >"._('Opération sauvée')." $internal ";
-            if ( $Ledger->pj != '') echo ' Piece : '.h($Ledger->pj);
-            echo "</h2>";
-            if ( strcmp($Ledger->pj,$_POST['e_pj']) != 0 )
-            {
-                echo '<h3 class="notice"> '._('Attention numéro pièce 
existante, elle a du être adaptée').'</h3>';
-            }
-            if (isset($Ledger->doc))
-            {
-                echo $Ledger->doc.'<hr>';
-            }
-            /* Save the additional information into jrn_info */
-            $obj=new Acc_Ledger_Info($cn);
-            $obj->save_extra($Ledger->jr_id,$_POST);
-            printf ('<a class="detail" style="display:inline" 
href="javascript:modifyOperation(%d,%d)">%s</a><hr>',
-                    $jr_id,dossier::id(),$internal);
-                       // Feedback
-                       echo $Ledger->confirm($_POST,true);
-            echo '</div>';
-            exit();
-        }
-    }
-    //  ------------------------------
-    /* Display a blank form or a form with predef operation */
-    /* or a form for correcting */
-    //  ------------------------------
+               echo '<h2 class="info"> Enregistrement </h2>';
+               echo "<h2 >" . _('Opération sauvée') . " $internal ";
+               if ($Ledger->pj != '')
+                       echo ' Piece : ' . h($Ledger->pj);
+               echo "</h2>";
+               if (strcmp($Ledger->pj, $_POST['e_pj']) != 0)
+               {
+                       echo '<h3 class="notice"> ' . _('Attention numéro pièce 
existante, elle a du être adaptée') . '</h3>';
+               }
+               if (isset($Ledger->doc))
+               {
+                       echo $Ledger->doc . '<hr>';
+               }
+               /* Save the additional information into jrn_info */
+               $obj = new Acc_Ledger_Info($cn);
+               $obj->save_extra($Ledger->jr_id, $_POST);
+               printf('<a class="detail" style="display:inline" 
href="javascript:modifyOperation(%d,%d)">%s</a><hr>', $jr_id, dossier::id(), 
$internal);
+               // Feedback
+               echo $Ledger->confirm($_POST, true);
+               echo '</div>';
+               exit();
+       }
+}
+//  ------------------------------
+/* Display a blank form or a form with predef operation */
+/* or a form for correcting */
+//  ------------------------------
 
-    echo '<div class="content">';
-       //
+echo '<div class="content">';
+//
 
 
-    $array=(isset($_POST['correct'])||isset ($correct))?$_POST:null;
-    $Ledger=new Acc_Ledger_Purchase($cn,0);
+$array = (isset($_POST['correct']) || isset($correct)) ? $_POST : null;
+$Ledger = new Acc_Ledger_Purchase($cn, 0);
 
 
-    if ( !isset($_REQUEST ['p_jrn']))
-    {
-        $def_ledger=$Ledger->get_first('ach');
-        $Ledger->id=$def_ledger['jrn_def_id'];
-    }
-    else
-        $Ledger->id=$_REQUEST ['p_jrn'];
+if (!isset($_REQUEST ['p_jrn']))
+{
+       $def_ledger = $Ledger->get_first('ach');
+       $Ledger->id = $def_ledger['jrn_def_id'];
+}
+else
+       $Ledger->id = $_REQUEST ['p_jrn'];
 
-       echo '<h2 id="jrn_name">'.$Ledger->get_name().'</h2>';
+echo '<h2 id="jrn_name">' . $Ledger->get_name() . '</h2>';
 // pre defined operation
 //
-    echo '<form method="GET" action="do.php">';
-    echo dossier::hidden();
-    echo HtmlInput::hidden('p_jrn_predef',$Ledger->id);
-    echo HtmlInput::hidden('ac',$_REQUEST['ac']);
-    $op=new Pre_op_ach($cn);
-    $op->set('ledger',$Ledger->id);
-    $op->set('ledger_type',"ACH");
-    $op->set('direct','f');
-    echo $op->form_get();
+echo '<form method="GET" action="do.php">';
+echo dossier::hidden();
+echo HtmlInput::hidden('p_jrn_predef', $Ledger->id);
+echo HtmlInput::hidden('ac', $_REQUEST['ac']);
+$op = new Pre_op_ach($cn);
+$op->set('ledger', $Ledger->id);
+$op->set('ledger_type', "ACH");
+$op->set('direct', 'f');
+echo $op->form_get();
 
-    echo '</form>';
-    echo "<FORM class=\"print\"NAME=\"form_detail\" METHOD=\"POST\" >";
-    /* request for a predefined operation */
-    if ( isset($_GET['use_opd']) && isset($_REQUEST['pre_def']) && ! 
isset($_POST['correct']))
-    {
-        // used a predefined operation
-        //
-        $op=new Pre_op_ach($cn);
-        $op->set_od_id($_REQUEST['pre_def']);
-        $p_post=$op->compute_array();
-        $Ledger->id=$_REQUEST ['p_jrn_predef'];
-        $p_post['p_jrn']=$Ledger->id;
-        echo $Ledger->input($p_post);
-        echo '<div class="content">';
-        echo $Ledger->input_paid();
-        echo '</div>';
-        echo '<script>';
-        echo 'compute_all_ledger();';
-        echo '</script>';
-    }
-    else
-    {
-        echo $Ledger->input($array);
-        echo HtmlInput::hidden("p_action","ach");
-        echo HtmlInput::hidden("sa","p");
-        echo '<div class="content">';
-        echo $Ledger->input_paid();
-        echo '</div>';
-        echo '<script>';
-        echo 'compute_all_ledger();';
-        echo '</script>';
-
-    }
-    echo '<div class="content">';
-    echo 
HtmlInput::button('act',_('Actualiser'),'onClick="compute_all_ledger();"');
-    echo HtmlInput::submit("view_invoice",_("Enregistrer"));
-    echo HtmlInput::reset(_('Effacer '));
-    echo '</div>';
-    echo "</FORM>";
-
-    if ( ! isset ($_POST['e_date'])) echo create_script(" get_last_date()");
-
-    echo '</div>';
-
-
-    exit();
-// end record invoice
-
-
-//-------------------------------------------------------------------------------
-// Listing
-//--------------------------------------------------------------------------------
-if ( $def == 2 )
+echo '</form>';
+echo "<FORM class=\"print\"NAME=\"form_detail\" METHOD=\"POST\" >";
+/* request for a predefined operation */
+if (isset($_GET['use_opd']) && isset($_REQUEST['pre_def']) && 
!isset($_POST['correct']))
 {
-
-
+       // used a predefined operation
+       //
+        $op = new Pre_op_ach($cn);
+       $op->set_od_id($_REQUEST['pre_def']);
+       $p_post = $op->compute_array();
+       $Ledger->id = $_REQUEST ['p_jrn_predef'];
+       $p_post['p_jrn'] = $Ledger->id;
+       echo $Ledger->input($p_post);
+       echo '<div class="content">';
+       echo $Ledger->input_paid();
+       echo '</div>';
+       echo '<script>';
+       echo 'compute_all_ledger();';
+       echo '</script>';
 }
-//---------------------------------------------------------------------------
-// Listing unpaid
-//---------------------------------------------------------------------------
-if ( $def==3 )
+else
 {
-    echo '<div class="content">';
-// Check privilege
-    if ( isset($_REQUEST['p_jrn']) &&
-            $g_user->check_jrn($_REQUEST['p_jrn']) == 'X')
-    {
-        NoAccess();
-        exit -1;
-    }
+       echo $Ledger->input($array);
+       echo HtmlInput::hidden("p_action", "ach");
+       echo HtmlInput::hidden("sa", "p");
+       echo '<div class="content">';
+       echo $Ledger->input_paid();
+       echo '</div>';
+       echo '<script>';
+       echo 'compute_all_ledger();';
+       echo '</script>';
+}
+echo '<div class="content">';
+echo HtmlInput::button('act', _('Actualiser'), 
'onClick="compute_all_ledger();"');
+echo HtmlInput::submit("view_invoice", _("Enregistrer"));
+echo HtmlInput::reset(_('Effacer '));
+echo '</div>';
+echo "</FORM>";
 
-    $Ledger=new Acc_Ledger_Purchase($cn,0);
-    if ( !isset($_REQUEST['p_jrn']))
-    {
-        $Ledger->id=-1;
-    }
-    else
-        $Ledger->id=$_REQUEST['p_jrn'];
-    echo $Ledger->display_search_form();
-    //------------------------------
-    // UPdate the payment
-    //------------------------------
-    if ( isset ( $_GET ['paid']))
-    {
-        $Ledger->update_paid($_GET);
-    }
-    /*  compute the sql stmt */
-    list($sql,$where)=$Ledger->build_search_sql($_GET);
-    if ( trim($where) != '')
-        $sql .= ' and '.SQL_LIST_UNPAID_INVOICE;
-    else
-        $sql .= ' where '.SQL_LIST_UNPAID_INVOICE;
+if (!isset($_POST['e_date']))
+       echo create_script(" get_last_date()");
 
-    $max_line=$cn->count_sql($sql);
+echo '</div>';
 
-    $step=$_SESSION['g_pagesize'];
-    $page=(isset($_GET['offset']))?$_GET['page']:1;
-    $offset=(isset($_GET['offset']))?$_GET['offset']:0;
-    $bar=jrn_navigation_bar($offset,$max_line,$step,$page);
 
-
-    echo '<form method="GET" id="fpaida" class="print" action="'.$href.'">';
-    echo HtmlInput::hidden("sa","lnp");
-    echo HtmlInput::hidden("p_action","ach");
-    echo dossier::hidden();
-    echo $bar;
-    list($count,$html)= $Ledger->list_operation($sql,$offset,1);
-    echo $html;
-    echo $bar;
-
-    
$r=HtmlInput::get_to_hidden(array('l','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);
-    }
-    echo $r;
-
-    echo '<p>'.HtmlInput::submit('paid',_('Mise à jour 
paiement')).IButton::select_checkbox('fpaida').IButton::unselect_checkbox('fpaida').'</p>';
-    echo '</form>';
-
-    echo '</div>';
-    exit();
-}
+exit();
+// end record invoice
\ No newline at end of file