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

[phpcompta-dev]

Author: danydb
Date: 2012-05-28 00:57:08 +0200 (Mon, 28 May 2012)
New Revision: 4845

Modified:
   phpcompta/trunk/include/action.common.inc.php
   phpcompta/trunk/include/action.inc.php
   phpcompta/trunk/include/class_follow_up.php
Log:
Fix problem with return button: the query must be saved

Modified: phpcompta/trunk/include/action.common.inc.php
===================================================================
--- phpcompta/trunk/include/action.common.inc.php       2012-05-27 22:39:17 UTC 
(rev 4844)
+++ phpcompta/trunk/include/action.common.inc.php       2012-05-27 22:57:08 UTC 
(rev 4845)
@@ -381,7 +381,7 @@
              // if a query is request build the sql stmt
              $query="and (ag_title ~* '".sql_string($_REQUEST['query'])."' ".
                "or ag_ref ='".trim(sql_string($_REQUEST['query'])).
-               "' or ag_comment ~* '".trim(sql_string($_REQUEST['query']))."'".
+               "' or ag_id in (select ag_id from action_gestion_comment where 
agc_comment ~* '".trim(sql_string($_REQUEST['query']))."')".
                ")";
            }
 

Modified: phpcompta/trunk/include/action.inc.php
===================================================================
--- phpcompta/trunk/include/action.inc.php      2012-05-27 22:39:17 UTC (rev 
4844)
+++ phpcompta/trunk/include/action.inc.php      2012-05-27 22:57:08 UTC (rev 
4845)
@@ -23,7 +23,7 @@
  */
 require_once('class_ipopup.php');
 global $g_user;
-$retour=HtmlInput::button_anchor(_('Retour 
liste'),'?ac='.$_REQUEST['ac'].'&my_action&'.dossier::get()."&".HtmlInput::get_to_string(array("qcode","ag_dest","query","tdoc","date_start","date_end","see_all","all_action")));
+$retour=HtmlInput::button_anchor(_('Retour 
liste'),HtmlInput::get_to_string(array("ac","gDossier","qcode","ag_dest","query","tdoc","date_start","date_end","see_all","all_action")).'&my_action');
 //-----------------------------------------------------
 // Follow_Up
 //-----------------------------------------------------

Modified: phpcompta/trunk/include/class_follow_up.php
===================================================================
--- phpcompta/trunk/include/class_follow_up.php 2012-05-27 22:39:17 UTC (rev 
4844)
+++ phpcompta/trunk/include/class_follow_up.php 2012-05-27 22:57:08 UTC (rev 
4845)
@@ -671,7 +671,7 @@
     {
         $str_dossier=dossier::get();
         // for the sort
-        
$url="?".$str_dossier.'&'.$p_base."&".HtmlInput::get_to_string(array("qcode","ag_dest","query","tdoc","date_start","date_end","see_all","all_action"));
+        
$url=HtmlInput::get_to_string(array("qcode","ag_dest","query","tdoc","date_start","date_end","see_all","all_action")).$str_dossier.'&'.$p_base;
 
                $table=new Sort_Table();
                $table->add('Date',$url,'order by ag_timestamp asc','order by 
ag_timestamp desc','da','dd');
@@ -749,7 +749,7 @@
         //show the sub_action
         foreach ($a_row as $row )
         {
-            $href='<A class="document" 
HREF="do.php?'.$p_base.'&sa=detail&ag_id='.$row['ag_id'].'&'.$str_dossier.'&ac='.$_REQUEST['ac']."&".HtmlInput::get_to_string(array("qcode","ag_dest","query","tdoc","date_start","date_end","see_all","all_action")).'">';
+            $href='<A class="document" 
HREF="do.php'.HtmlInput::get_to_string(array("gDossier","qcode","ag_dest","query","tdoc","date_start","date_end","see_all","ac","all_action"))."&".$p_base.'&sa=detail&ag_id='.$row['ag_id'].'">';
             $i++;
             $tr=($i%2==0)?'even':'odd';
             if ($row['ag_priority'] < 2) $tr='priority1';



---
PhpCompta est un logiciel de comptabilité libre en ligne (full web)
Projet opensource http://www.phpcompta.eu