[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpcompta-dev] r4875 - in phpcompta/trunk/include: . template
|
From: |
phpcompta-dev |
|
Subject: |
[Phpcompta-dev] r4875 - in phpcompta/trunk/include: . template |
|
Date: |
Sat, 9 Jun 2012 17:44:24 +0200 (CEST) |
Author: danydb
Date: 2012-06-09 17:44:24 +0200 (Sat, 09 Jun 2012)
New Revision: 4875
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:
0000609: recherche num?\195?\169ro de r?\195?\169f?\195?\169rence action_gestion
Modified: phpcompta/trunk/include/action.common.inc.php
===================================================================
--- phpcompta/trunk/include/action.common.inc.php 2012-06-09 15:19:20 UTC
(rev 4874)
+++ phpcompta/trunk/include/action.common.inc.php 2012-06-09 15:44:24 UTC
(rev 4875)
@@ -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("only_internal","state","gDossier","qcode","start_date","end_date","ag_id","ag_dest_query",
+ echo
HtmlInput::request_to_hidden(array("sag_ref","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 15:19:20 UTC (rev
4874)
+++ phpcompta/trunk/include/action.inc.php 2012-06-09 15:44:24 UTC (rev
4875)
@@ -23,7 +23,7 @@
*/
require_once('class_ipopup.php');
global $g_user;
-$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');
+$retour=HtmlInput::button_anchor(_('Retour
liste'),HtmlInput::request_to_string(array("sag_ref","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 15:19:20 UTC
(rev 4874)
+++ phpcompta/trunk/include/category_followup.inc.php 2012-06-09 15:44:24 UTC
(rev 4875)
@@ -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("only_internal","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("sag_ref","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 15:19:20 UTC (rev
4874)
+++ phpcompta/trunk/include/class_follow_up.php 2012-06-09 15:44:24 UTC (rev
4875)
@@ -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("only_internal","state","qcode",
"ag_dest_query", "query", "tdoc", "date_start", "date_end", "see_all",
"all_action"));
+
$r.=HtmlInput::request_to_hidden(array("sag_ref","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("only_internal","state","qcode",
"ag_dest_query", "query", "tdoc", "date_start", "date_end", "see_all",
"all_action")) . '&' . $p_base;
+ $url =
HtmlInput::get_to_string(array("sag_ref","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("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'] . '">';
+ $href = '<A class="document" HREF="do.php' .
HtmlInput::get_to_string(array("sag_ref","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)
@@ -1146,6 +1146,8 @@
$ag_dest->value = $aAg_dest;
$ag_dest->selected = (isset($_GET["ag_dest_query"])) ?
$_GET["ag_dest_query"] : 0;
$str_ag_dest = $ag_dest->input();
+ $osag_ref=new IText("sag_ref");
+ $osag_ref->value=(isset($_GET['sag_ref']))?$_GET['sag_ref']:"";
// show the action in
require_once 'template/action_search.php';
}
@@ -1217,6 +1219,10 @@
{
$query .= ' and ag_state= ' . sql_string($state);
}
+ if (isset($sag_ref) && trim($sag_ref) != "")
+ {
+ $query .= ' and ag_ref= \'' . sql_string($sag_ref)."'";
+ }
if (!isset($_GET['see_all']))
$query .= ' and ag_state in (2,3) ';
if (isset($_GET['only_internal']))
Modified: phpcompta/trunk/include/template/action_search.php
===================================================================
--- phpcompta/trunk/include/template/action_search.php 2012-06-09 15:19:20 UTC
(rev 4874)
+++ phpcompta/trunk/include/template/action_search.php 2012-06-09 15:44:24 UTC
(rev 4875)
@@ -46,8 +46,13 @@
<?=HtmlInput::hidden('ctlc',$_GET['ctlc'])?>
<? endif; ?>
<?= dossier::hidden()?>
- <table style="width:100%">
+ <table style="width:100%"><tr>
+ <td style="width:180px;text-align:right"> Référence</td>
+ <td>
+ <?=$osag_ref->input();?>
+ </td>
<tr>
+ <tr>
<td style="width:180px;text-align:right">
Numéro document</td>
<td>
<? $num=new INum('ag_id');echo
$num->input();?>
---
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] r4875 - in phpcompta/trunk/include: . template,
phpcompta-dev <=