[Noalyss-commit] [noalyss] 69/173: Fiche.clasS.php fix broken merge

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit 445dbdf9cb1156f9844c542668c8a1268407b070
Author: Dany De Bontridder <danydb@noalyss.eu>
AuthorDate: Sun Feb 3 22:09:34 2019 +0100

    Fiche.clasS.php fix broken merge
---
 include/class/fiche.class.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/include/class/fiche.class.php b/include/class/fiche.class.php
index 2224314..0bc8e09 100644
--- a/include/class/fiche.class.php
+++ b/include/class/fiche.class.php
@@ -2057,7 +2057,6 @@ class Fiche
         if ( $count > 0 ) return TRUE;
         
         $count=$this->cn->get_value("select count(*) 
-                                select count(*) 
                 from attr_def
                 join fiche_detail using (ad_id)
                 where ad_type='card'
@@ -2292,7 +2291,7 @@ class Fiche
      */
 
     function filter_history($p_table_id) {
-        return _('Cherche').' '.HtmlInput::filter_table($p_table_id, 
'0,1,2,3,4,5,6,7', 1);
+        return _('Cherche').' '.HtmlInput::filter_table($p_table_id, 
'0,1,2,3,4,5,6,7,8,9,10', 1);
     }
     /**
      * Returns the Acc_Ledger_Fin ledger for which the card is the default 
bank account or null if no ledger is found.