[Phpcompta-dev] r4874 - in phpcompta/trunk/include: . template

[phpcompta-dev]

Author: danydb
Date: 2012-06-09 17:19:20 +0200 (Sat, 09 Jun 2012)
New Revision: 4874

Modified:
   phpcompta/trunk/include/action.common.inc.php
   phpcompta/trunk/include/action.inc.php
   phpcompta/trunk/include/category_followup.inc.php
   phpcompta/trunk/include/class_follow_up.php
   phpcompta/trunk/include/template/action_search.php
Log:
0000608: Dans le boite de recherche action : uniquement interne

Modified: phpcompta/trunk/include/action.common.inc.php
===================================================================
--- phpcompta/trunk/include/action.common.inc.php       2012-06-09 14:37:22 UTC 
(rev 4873)
+++ phpcompta/trunk/include/action.common.inc.php       2012-06-09 15:19:20 UTC 
(rev 4874)
@@ -174,7 +174,7 @@
     Follow_Up::ShowActionList($cn,$base);
        // Add a button to export to Csv
        echo '<form method="GET" ACTION="export.php">';
-       echo 
HtmlInput::request_to_hidden(array("state","gDossier","qcode","start_date","end_date","ag_id","ag_dest_query",
+       echo 
HtmlInput::request_to_hidden(array("only_internal","state","gDossier","qcode","start_date","end_date","ag_id","ag_dest_query",
                        "tdoc","see_all","all_action","query"));
        echo HtmlInput::hidden("act", "CSV:ActionGestion");
        echo HtmlInput::submit("follow_up_csv", "Export CSV");

Modified: phpcompta/trunk/include/action.inc.php
===================================================================
--- phpcompta/trunk/include/action.inc.php      2012-06-09 14:37:22 UTC (rev 
4873)
+++ phpcompta/trunk/include/action.inc.php      2012-06-09 15:19:20 UTC (rev 
4874)
@@ -23,7 +23,7 @@
  */
 require_once('class_ipopup.php');
 global $g_user;
-$retour=HtmlInput::button_anchor(_('Retour 
liste'),HtmlInput::request_to_string(array("state","ac","gDossier","qcode","ag_dest_query","query","tdoc","date_start","date_end","see_all","all_action")).'&my_action');
+$retour=HtmlInput::button_anchor(_('Retour 
liste'),HtmlInput::request_to_string(array("only_internal","state","ac","gDossier","qcode","ag_dest_query","query","tdoc","date_start","date_end","see_all","all_action")).'&my_action');
 //-----------------------------------------------------
 // Follow_Up
 //-----------------------------------------------------

Modified: phpcompta/trunk/include/category_followup.inc.php
===================================================================
--- phpcompta/trunk/include/category_followup.inc.php   2012-06-09 14:37:22 UTC 
(rev 4873)
+++ phpcompta/trunk/include/category_followup.inc.php   2012-06-09 15:19:20 UTC 
(rev 4874)
@@ -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("state","gDossier","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("only_internal","state","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-09 14:37:22 UTC (rev 
4873)
+++ phpcompta/trunk/include/class_follow_up.php 2012-06-09 15:19:20 UTC (rev 
4874)
@@ -488,7 +488,7 @@
                /* add the number of item */
                $Hid = new IHidden();
                $r.=$Hid->input("nb_item", MAX_ARTICLE);
-               $r.=HtmlInput::request_to_hidden(array("state","qcode", 
"ag_dest_query", "query", "tdoc", "date_start", "date_end", "see_all", 
"all_action"));
+               
$r.=HtmlInput::request_to_hidden(array("only_internal","state","qcode", 
"ag_dest_query", "query", "tdoc", "date_start", "date_end", "see_all", 
"all_action"));
                /* get template */
                ob_start();
                require_once 'template/detail-action.php';
@@ -663,7 +663,7 @@
        function myList($p_base, $p_filter = "", $p_search = "")
        {
                // for the sort
-               $url = HtmlInput::get_to_string(array("state","qcode", 
"ag_dest_query", "query", "tdoc", "date_start", "date_end", "see_all", 
"all_action")) . '&' . $p_base;
+               $url = 
HtmlInput::get_to_string(array("only_internal","state","qcode", 
"ag_dest_query", "query", "tdoc", "date_start", "date_end", "see_all", 
"all_action")) . '&' . $p_base;
 
                $table = new Sort_Table();
                $table->add('Date', $url, 'order by ag_timestamp asc', 'order 
by ag_timestamp desc', 'da', 'dd');
@@ -735,7 +735,7 @@
                //show the sub_action
                foreach ($a_row as $row)
                {
-                       $href = '<A class="document" HREF="do.php' . 
HtmlInput::get_to_string(array("state","gDossier", "qcode", "ag_dest_query", 
"query", "tdoc", "date_start", "date_end", "see_all", "ac", "all_action")) . 
"&" . $p_base . '&sa=detail&ag_id=' . $row['ag_id'] . '">';
+                       $href = '<A class="document" HREF="do.php' . 
HtmlInput::get_to_string(array("only_internal","state","gDossier", "qcode", 
"ag_dest_query", "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)
@@ -1134,6 +1134,8 @@
                $see_all->selected = (isset($_GET['see_all'])) ? true : false;
                $my_action = new ICheckBox('all_action');
                $my_action->selected = (isset($_GET['all_action'])) ? true : 
false;
+               $only_internal= new ICheckBox('only_internal');
+               $only_internal->selected = (isset($_GET['only_internal'])) ? 
true : false;
                // select profile
                $aAg_dest = $cn->make_array("select  p_id as value, " .
                                "p_name as label " .
@@ -1217,6 +1219,8 @@
                }
                if (!isset($_GET['see_all']))
                        $query .= ' and ag_state in (2,3) ';
+               if (isset($_GET['only_internal']))
+                       $query .= ' and f_id_dest=0 ';
                if (!isset($all_action))
                {
                        $query .=" and (ag_owner='" . $_SESSION['g_user'] . "' 
or ag_dest in (select p_id from profile_user where user_name='" . 
$_SESSION['g_user'] . "') or ag_dest is null )";

Modified: phpcompta/trunk/include/template/action_search.php
===================================================================
--- phpcompta/trunk/include/template/action_search.php  2012-06-09 14:37:22 UTC 
(rev 4873)
+++ phpcompta/trunk/include/template/action_search.php  2012-06-09 15:19:20 UTC 
(rev 4874)
@@ -100,6 +100,11 @@
                                <td><?= $my_action->input()?>
                                </td>
                        </tr>
+                       <tr>
+                               <td style="text-align:right"><?= _('Uniquement 
actions internes')?></td>
+                               <td><?= $only_internal->input()?>
+                               </td>
+                       </tr>
                </table>
                <input type="submit" class="button" name="submit_query" 
value="<?= _('recherche')?>">
                <input type="hidden" name="sa" value="list">



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