diff --git a/html/ajax_misc.php b/html/ajax_misc.php
index d0d3b207c..493e92dfd 100644
--- a/html/ajax_misc.php
+++ b/html/ajax_misc.php
@@ -247,10 +247,6 @@ $path = array(
"tva_parameter"=>"ajax_tva_parameter",
// Currency , delete a rate
"CurrencyRateDelete"=>"ajax_currency",
- // Display all cards using an accounting
- "display_all_card"=>"ajax_display_all_card",
- // Currency , add / remove / update currency
- "CurrencyManage"=>"ajax_currency"
) ;
if (array_key_exists($op, $path)) {
diff --git a/html/do.php b/html/do.php
index 2b463292d..6ec340c7a 100644
--- a/html/do.php
+++ b/html/do.php
@@ -108,6 +108,10 @@ html_page_start($style_user);
if ( DEBUG ) {
?>
+
Memory Usage
+
+
+
$_POST
$GLOBALS
@@ -344,10 +349,12 @@ else
catch (Exception $exc)
{
echo $exc->getMessage();
+ record_log("No user profile ");
+ record_log($exc->getMessage());
record_log($exc->getTraceAsString());
- throw $e;
+ throw $exc;
}
-
+
}
diff --git a/html/fid_card.php b/html/fid_card.php
index 57577bb18..52fe5f955 100644
--- a/html/fid_card.php
+++ b/html/fid_card.php
@@ -44,6 +44,9 @@ require_once NOALYSS_INCLUDE.'/class/dossier.class.php';
*/
$http=new HttpInput();
+$jrn= $http->request("j","number",-1);
+$limit=$http->request("limit","number",12);
+
$jrn= $http->request("j","number",-1);
$filter_card="";
$cn=Dossier::connect();
@@ -117,19 +120,17 @@ else
}
}
-
-/* create a filter based on j */
-/*$sql_str="select f_id, vw_name,quick_code,vw_description ".
- " from vw_fiche_attr where ".
- " ( vw_name ilike '%'||$1||'%' or quick_code ilike $2||'%' or vw_description ilike '%'||$3||'%') ".
- $filter_card;
-*/
-
-$sql_str="select distinct f_id from fiche join fiche_detail using (f_id) where ad_id in (9,1,23) and ad_value ilike '%'||$1||'%' ".$filter_card.' limit 12';
+$sql_str="select distinct f_id
+ from fiche
+ join fiche_detail using (f_id)
+ where
+ ad_id in (9,1,23)
+ and ad_value ilike '%'||$1||'%' ".$filter_card.' limit '.$limit;
$fid=$http->request("FID");
+
$sql=$cn->get_array($sql_str ,array($fid));
if ($sql != false && sizeof($sql) != 0 )
diff --git a/html/image/fontello/fontello.eot b/html/image/fontello/fontello.eot
index b1e33b84a..f9a98fda4 100644
Binary files a/html/image/fontello/fontello.eot and b/html/image/fontello/fontello.eot differ
diff --git a/html/image/fontello/fontello.svg b/html/image/fontello/fontello.svg
index ce270cb1a..a610d15c9 100644
--- a/html/image/fontello/fontello.svg
+++ b/html/image/fontello/fontello.svg
@@ -1,7 +1,7 @@