[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpcompta-dev] r4957 - in phpcompta/trunk/include: . template
|
From: |
phpcompta-dev |
|
Subject: |
[Phpcompta-dev] r4957 - in phpcompta/trunk/include: . template |
|
Date: |
Thu, 21 Jun 2012 13:39:28 +0200 (CEST) |
Author: danydb
Date: 2012-06-21 13:39:28 +0200 (Thu, 21 Jun 2012)
New Revision: 4957
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:
0000638: Recherche action gestion
Ajout dans profile : tous les profiles
Modified: phpcompta/trunk/include/action.common.inc.php
===================================================================
--- phpcompta/trunk/include/action.common.inc.php 2012-06-21 11:24:25 UTC
(rev 4956)
+++ phpcompta/trunk/include/action.common.inc.php 2012-06-21 11:39:28 UTC
(rev 4957)
@@ -195,7 +195,7 @@
// Add a button to export to Csv
echo '<form method="GET" ACTION="export.php">';
echo
HtmlInput::request_to_hidden(array("remind_date_end","remind_date","sag_ref",
"remind_date","only_internal", "state", "gDossier", "qcode", "start_date",
"end_date", "ag_id", "ag_dest_query",
- "tdoc", "hsstate", "all_action", "query"));
+ "tdoc", "query"));
echo HtmlInput::hidden("act", "CSV:ActionGestion");
echo HtmlInput::submit("follow_up_csv", "Export CSV");
echo "</form>";
Modified: phpcompta/trunk/include/action.inc.php
===================================================================
--- phpcompta/trunk/include/action.inc.php 2012-06-21 11:24:25 UTC (rev
4956)
+++ phpcompta/trunk/include/action.inc.php 2012-06-21 11:39:28 UTC (rev
4957)
@@ -24,7 +24,7 @@
require_once('class_ipopup.php');
global $g_user;
$retour=HtmlInput::button_anchor(_('Retour liste'),
-
HtmlInput::request_to_string(array("remind_date_end","remind_date","sag_ref","only_internal","state","ac","gDossier","qcode","ag_dest_query","query","tdoc","date_start","date_end","hsstate","all_action")).'&my_action');
+
HtmlInput::request_to_string(array("remind_date_end","remind_date","sag_ref","only_internal","state","ac","gDossier","qcode","ag_dest_query","query","tdoc","date_start","date_end","hsstate")));
//-----------------------------------------------------
// Follow_Up
//-----------------------------------------------------
Modified: phpcompta/trunk/include/category_followup.inc.php
===================================================================
--- phpcompta/trunk/include/category_followup.inc.php 2012-06-21 11:24:25 UTC
(rev 4956)
+++ phpcompta/trunk/include/category_followup.inc.php 2012-06-21 11:39:28 UTC
(rev 4957)
@@ -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("remind_date_end","remind_date","sag_ref","only_internal","state","gDossier","qcode","ag_dest","query","tdoc","date_start","date_end","hsstate","all_action","sb","sc"),"");
+$base="ac=$p_action&sc=sv&sb=detail&f_id=".$_REQUEST['f_id']."&".HtmlInput::request_to_string(array("remind_date_end","remind_date","sag_ref","only_internal","state","gDossier","qcode","ag_dest","query","tdoc","date_start","date_end","hsstate","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-21 11:24:25 UTC (rev
4956)
+++ phpcompta/trunk/include/class_follow_up.php 2012-06-21 11:39:28 UTC (rev
4957)
@@ -498,7 +498,7 @@
/* add the number of item */
$Hid = new IHidden();
$r.=$Hid->input("nb_item", MAX_ARTICLE);
-
$r.=HtmlInput::request_to_hidden(array("remind_date_end","remind_date","sag_ref","only_internal","state","qcode",
"ag_dest_query", "query", "tdoc", "date_start", "date_end", "hsstate",
"all_action"));
+
$r.=HtmlInput::request_to_hidden(array("remind_date_end","remind_date","sag_ref","only_internal","state","qcode",
"ag_dest_query", "query", "tdoc", "date_start", "date_end", "hsstate"));
/* get template */
ob_start();
require_once 'template/detail-action.php';
@@ -671,7 +671,7 @@
function myList($p_base, $p_filter = "", $p_search = "")
{
// for the sort
- $url =
HtmlInput::get_to_string(array("remind_date_end","remind_date","sag_ref","only_internal","state","qcode",
"ag_dest_query", "query", "tdoc", "date_start", "date_end", "hsstate",
"all_action")) . '&' . $p_base;
+ $url =
HtmlInput::get_to_string(array("remind_date_end","remind_date","sag_ref","only_internal","state","qcode",
"ag_dest_query", "query", "tdoc", "date_start", "date_end", "hsstate")) . '&'
. $p_base;
$table = new Sort_Table();
$table->add('Date', $url, 'order by ag_timestamp asc', 'order
by ag_timestamp desc', 'da', 'dd');
@@ -743,7 +743,7 @@
//show the sub_action
foreach ($a_row as $row)
{
- $href = '<A class="document" HREF="do.php?' . $p_base
.HtmlInput::get_to_string(array("remind_date_end","remind_date","sag_ref","only_internal","state","gDossier",
"qcode", "ag_dest_query", "query", "tdoc", "date_start", "date_end",
"hsstate", "ac", "all_action"),"&") . '&sa=detail&ag_id=' . $row['ag_id'] .
'">';
+ $href = '<A class="document" HREF="do.php?' . $p_base
.HtmlInput::get_to_string(array("remind_date_end","remind_date","sag_ref","only_internal","state","gDossier",
"qcode", "ag_dest_query", "query", "tdoc", "date_start", "date_end",
"hsstate", "ac"),"&") . '&sa=detail&ag_id=' . $row['ag_id'] . '">';
$i++;
$tr = ($i % 2 == 0) ? 'even' : 'odd';
if ($row['ag_priority'] < 2)
@@ -1146,14 +1146,13 @@
$end = new IDate('date_end');
$end->value = (isset($_GET['date_end'])) ? $_GET['date_end'] :
"";
- $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 " .
" from profile order by 2");
+ $aAg_dest[] = array('value' => '-2', 'label' => _('Tous les
profiles'));
$ag_dest = new ISelect();
$ag_dest->name = "ag_dest_query";
$ag_dest->value = $aAg_dest;
@@ -1247,10 +1246,7 @@
if (isset($_GET['only_internal']))
$query .= ' and f_id_dest=0 ';
- if ( isset($all_action))
- {
- $query .=" and (ag_owner='" . $_SESSION['g_user'] . "'
or ".self::sql_security_filter($cn, "R")." or ag_dest=-1 )";
- }
+
if (isset($date_start) && isDate($date_start) != null)
{
$query.=" and ag_timestamp >=
to_date('$date_start','DD.MM.YYYY')";
@@ -1259,10 +1255,16 @@
{
$query.=" and ag_timestamp <=
to_date('$date_end','DD.MM.YYYY')";
}
- if (isset($ag_dest_query)&& ! isset($all_action) )
+ if (isset($ag_dest_query) && $ag_dest_query != -2 )
{
- $query.= " and ag_dest = " .
sql_string($ag_dest_query);
- }
+ $query.= " and ag_dest = " . sql_string($ag_dest_query);
+ }
+ else
+ {
+ $query .=" and (ag_owner='" . $_SESSION['g_user'] . "' or
".self::sql_security_filter($cn, "R")." or ag_dest=-1 )";
+ }
+
+
if (isNumber($ag_id) == 1 && $ag_id != 0)
{
$query = " and ag_id= " . sql_string($ag_id);
Modified: phpcompta/trunk/include/template/action_search.php
===================================================================
--- phpcompta/trunk/include/template/action_search.php 2012-06-21 11:24:25 UTC
(rev 4956)
+++ phpcompta/trunk/include/template/action_search.php 2012-06-21 11:39:28 UTC
(rev 4957)
@@ -109,11 +109,6 @@
</tr>
</tr>
<tr>
- <td style="text-align:right"><?= _('les actions
affectées à d\'autres')?></td>
- <td><?= $my_action->input()?>
- </td>
- </tr>
- <tr>
<td style="text-align:right"><?= _('Uniquement
actions internes')?></td>
<td><?= $only_internal->input()?>
</td>
---
PhpCompta est un logiciel de comptabilité libre en ligne (full web)
Projet opensource http://www.phpcompta.eu
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpcompta-dev] r4957 - in phpcompta/trunk/include: . template,
phpcompta-dev <=