[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpcompta-dev] r5028 - phpcompta/trunk/include
From: |
phpcompta-dev |
Subject: |
[Phpcompta-dev] r5028 - phpcompta/trunk/include |
Date: |
Thu, 28 Jun 2012 15:46:26 +0200 (CEST) |
Author: danydb
Date: 2012-06-28 15:46:25 +0200 (Thu, 28 Jun 2012)
New Revision: 5028
Modified:
phpcompta/trunk/include/action.common.inc.php
phpcompta/trunk/include/class_acc_ledger.php
phpcompta/trunk/include/class_follow_up.php
Log:
Improve comment, remove todo
Modified: phpcompta/trunk/include/action.common.inc.php
===================================================================
--- phpcompta/trunk/include/action.common.inc.php 2012-06-28 08:15:16 UTC
(rev 5027)
+++ phpcompta/trunk/include/action.common.inc.php 2012-06-28 13:46:25 UTC
(rev 5028)
@@ -181,7 +181,7 @@
if ($g_user->can_write_action($_REQUEST['ag_id'])==true)
$act->remove();
$sub_action = "list";
$cn->commit();
- Follow_Up::ShowActionList($cn, $base);
+ Follow_Up::show_action_list($cn, $base);
if (isset($act->ag_ref))
echo hb(_('Action ') . $act->ag_ref . _(' effacée'));
exit();
@@ -191,7 +191,7 @@
// Show a list of the action
if ($sub_action == "list")
{
- Follow_Up::ShowActionList($cn, $base);
+ Follow_Up::show_action_list($cn, $base);
// 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",
@@ -244,7 +244,7 @@
$url = "?$base&sa=detail&ag_id=" . $act->ag_id . '&' . dossier::get();
echo '<p><a class="mtitle" href="' . $url . '">' . hb('Action Sauvée :
' . $act->ag_ref) . '</a></p>';
- Follow_Up::ShowActionList($cn,$base);
+ Follow_Up::show_action_list($cn,$base);
$url = "?$base&sa=detail&ag_id=" . $act->ag_id . '&' . dossier::get();
echo '<p><a class="mtitle" href="' . $url . '">' . hb('Action Sauvée :
' . $act->ag_ref) . '</a></p>';
}
Modified: phpcompta/trunk/include/class_acc_ledger.php
===================================================================
--- phpcompta/trunk/include/class_acc_ledger.php 2012-06-28 08:15:16 UTC
(rev 5027)
+++ phpcompta/trunk/include/class_acc_ledger.php 2012-06-28 13:46:25 UTC
(rev 5028)
@@ -321,10 +321,6 @@
$sql = "delete from stock_goods where sg_id = any (
select sg_id
from stock_goods natural join jrnx where j_grpt=" .
$this->jr_grpt_id . ")";
$Res = $this->db->exec_sql($sql);
- /**
- * @function
- * @todo remove also from ANC */
- // Check return code
if ($Res == false)
throw (new Exception(__FILE__ . __LINE__ . "sql
a echoue [ $sql ]"));
}
Modified: phpcompta/trunk/include/class_follow_up.php
===================================================================
--- phpcompta/trunk/include/class_follow_up.php 2012-06-28 08:15:16 UTC (rev
5027)
+++ phpcompta/trunk/include/class_follow_up.php 2012-06-28 13:46:25 UTC (rev
5028)
@@ -1013,7 +1013,10 @@
$array = $this->db->get_array($sql);
return $array;
}
-
+ /**
+ * get the action where the remind day is today
+ * @return array
+ */
function get_today()
{
$sql = "select coalesce(vw_name,'Interne') as
vw_name,ag_id,ag_title,ag_ref, dt_value,to_char(ag_timestamp,'DD.MM.YYYY') as
ag_timestamp_fmt,ag_timestamp " .
@@ -1146,8 +1149,12 @@
// show the action in
require_once 'template/action_search.php';
}
-
- static function ShowActionList($cn, $p_base)
+ /**
+ address@hidden show a list of actions
+ * @param $cn database connextion
+ * @param $p_base base URL
+ */
+ static function show_action_list($cn, $p_base)
{
Follow_Up::display_search($cn);
@@ -1177,11 +1184,9 @@
extract($p_array);
$query = "";
- /**
- address@hidden check why we need to use $_REQUEST['query']
- * instead of $_GET['query']
- */
- if (isset($_REQUEST['query']))
+
+
+ if (isset($_REQUEST['query']))
{
// if a query is request build the sql stmt
$query = "and (ag_title ~* '" .
sql_string($_REQUEST['query']) . "' " .
---
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] r5028 - phpcompta/trunk/include,
phpcompta-dev <=