[Phpcompta-dev] r4855 - in phpcompta/trunk: html/js include include/template

[phpcompta-dev]

Author: danydb
Date: 2012-06-02 12:55:50 +0200 (Sat, 02 Jun 2012)
New Revision: 4855

Modified:
   phpcompta/trunk/html/js/scripts.js
   phpcompta/trunk/include/action.common.inc.php
   phpcompta/trunk/include/ajax_search_action.php
   phpcompta/trunk/include/category_followup.inc.php
   phpcompta/trunk/include/class_follow_up.php
   phpcompta/trunk/include/class_html_input.php
   phpcompta/trunk/include/template/detail-action.php
Log:
Remove debug, fix bug with link of related action

Modified: phpcompta/trunk/html/js/scripts.js
===================================================================
--- phpcompta/trunk/html/js/scripts.js  2012-06-02 10:27:26 UTC (rev 4854)
+++ phpcompta/trunk/html/js/scripts.js  2012-06-02 10:55:50 UTC (rev 4855)
@@ -1426,7 +1426,6 @@
      try
     {
         var queryString=$(obj).serialize()+"&op=search_action";
-               alert (queryString);
         var action = new Ajax.Request(
             "ajax_misc.php" ,
             {method:'get',

Modified: phpcompta/trunk/include/action.common.inc.php
===================================================================
--- phpcompta/trunk/include/action.common.inc.php       2012-06-02 10:27:26 UTC 
(rev 4854)
+++ phpcompta/trunk/include/action.common.inc.php       2012-06-02 10:55:50 UTC 
(rev 4855)
@@ -85,7 +85,7 @@
         $act2=new Follow_Up($cn);
         $act2->fromArray($_POST );
                 $sub_action="detail";
-
+                put_global(array(array('key'=>"sa","value"=>"detail")));
          $act2->Update();
       }
     //----------------------------------------------------------------------

Modified: phpcompta/trunk/include/ajax_search_action.php
===================================================================
--- phpcompta/trunk/include/ajax_search_action.php      2012-06-02 10:27:26 UTC 
(rev 4854)
+++ phpcompta/trunk/include/ajax_search_action.php      2012-06-02 10:55:50 UTC 
(rev 4855)
@@ -29,7 +29,5 @@
 echo Follow_Up::display_search($cn,true);
 
 $sql=  "true ".Follow_Up::create_query($cn);
-var_dump($_GET);
-echo $sql;
 echo Follow_Up::short_list($cn, $sql);
 ?>

Modified: phpcompta/trunk/include/category_followup.inc.php
===================================================================
--- phpcompta/trunk/include/category_followup.inc.php   2012-06-02 10:27:26 UTC 
(rev 4854)
+++ phpcompta/trunk/include/category_followup.inc.php   2012-06-02 10:55:50 UTC 
(rev 4855)
@@ -37,7 +37,7 @@
 $sub_action=(isset($_REQUEST['sa']))?$_REQUEST['sa']:"list";
 $ag_id=(isset($_REQUEST['ag_id']))?$_REQUEST['ag_id']:0;
 $p_action=$_REQUEST['ac'];
-$base="ac=$p_action&sc=sv&sb=detail&f_id=".$_REQUEST['f_id']."&".HtmlInput::request_to_string(array("qcode","ag_dest","query","tdoc","date_start","date_end","see_all","all_action","sb","sc"),"");
+$base="ac=$p_action&sc=sv&sb=detail&f_id=".$_REQUEST['f_id']."&".HtmlInput::request_to_string(array("gDossier","qcode","ag_dest","query","tdoc","date_start","date_end","see_all","all_action","sb","sc"),"");
 $retour=HtmlInput::button_anchor('Retour','?'.dossier::get().'&'.$base);
 $fiche=new Fiche($cn,$_REQUEST['f_id']);
 

Modified: phpcompta/trunk/include/class_follow_up.php
===================================================================
--- phpcompta/trunk/include/class_follow_up.php 2012-06-02 10:27:26 UTC (rev 
4854)
+++ phpcompta/trunk/include/class_follow_up.php 2012-06-02 10:55:50 UTC (rev 
4855)
@@ -171,8 +171,9 @@
                // List related action
                $action = $this->db->get_array("
                        select ag_id,ag_ref,substr(ag_title,1,40) as 
sub_title,to_char(ag_timestamp,'DD.MM.YY') as str_date ,
-                               ag_timestamp
+                               ag_timestamp,dt_value
                                        from action_gestion
+                                        join document_type on (ag_type=dt_id)
                                where
                                ag_id in (select aga_greatest from 
action_gestion_related where aga_least =$1)
                                or
@@ -1212,7 +1213,7 @@
                $sql = "
              select ag_id,to_char(ag_timestamp,'DD.MM.YY') as my_date,
                         f_id_dest,
-             substr(ag_title,1,30) as sub_ag_title,dt_value,ag_ref, 
ag_priority,ag_state,
+             substr(ag_title,1,40) as sub_ag_title,dt_value,ag_ref, 
ag_priority,ag_state,
                        coalesce((select p_name from profile where 
p_id=ag_dest),'Aucun groupe') as dest,
                                (select ad_value from fiche_Detail where 
f_id=action_gestion.f_id_dest and ad_id=1) as name
              from action_gestion

Modified: phpcompta/trunk/include/class_html_input.php
===================================================================
--- phpcompta/trunk/include/class_html_input.php        2012-06-02 10:27:26 UTC 
(rev 4854)
+++ phpcompta/trunk/include/class_html_input.php        2012-06-02 10:55:50 UTC 
(rev 4855)
@@ -425,7 +425,7 @@
     {
        $r='';
        $r.='<div style="float:right;right;margin:2;">';
-       $r.= '<A id="close_div" HREF="javascript:void(0)" 
onclick="'.$javascript.'"">'.$action.'</A>';
+       $r.= '<A id="close_div" HREF="javascript:void(0)" 
onclick="'.$javascript.'">'.$action.'</A>';
        $r.='</div>';
        return $r;
     }

Modified: phpcompta/trunk/include/template/detail-action.php
===================================================================
--- phpcompta/trunk/include/template/detail-action.php  2012-06-02 10:27:26 UTC 
(rev 4854)
+++ phpcompta/trunk/include/template/detail-action.php  2012-06-02 10:55:50 UTC 
(rev 4855)
@@ -165,7 +165,7 @@
                        $showAction='<a class="line" 
href="'.$base."&ag_id=".$action[$o]['ag_id'].'">';
                        $js= '<a class="mtitle" style="color:orange" 
id="acact'.$action[$o]['ag_id'].'" href="'.$rmAction.'">Effacer</a>';
                        echo '<li 
id="act'.$action[$o]['ag_id'].'">'.$showAction.$action[$o]['str_date']." 
".$action[$o]['ag_ref']." ".
-                                       h($action[$o]['sub_title']).'</a>'." "
+                                       
h($action[$o]['sub_title']).'('.h($action[$o]['dt_value']).')</a>'." "
                                .$js.'</li>';
                }
 



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