admingit/altocompta
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve comment, remove todo

Browse source
This commit is contained in:
Dany De Bontridder 2012-06-28 13:46:25 +00:00
parent b6389b48ef
commit 6c2a16c7db
3 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/action.common.inc.php
View file

@ -181,7 +181,7 @@ if ($sub_action == 'delete')
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 @@ if ($sub_action == 'delete')
// 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 @@ if ($sub_action == "save_action_st2")
$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>';
}

4
include/class_acc_ledger.php
View file

@ -321,10 +321,6 @@ class Acc_Ledger extends jrn_def_sql
$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 ]"));
}

21
include/class_follow_up.php
View file

@ -1013,7 +1013,10 @@ class Follow_Up
$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 @@ class Follow_Up
// show the action in
require_once 'template/action_search.php';
}
static function ShowActionList($cn, $p_base)
/**
*@brief 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 @@ class Follow_Up
extract($p_array);
$query = "";
/**
*@todo 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']) . "' " .