[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 69/173: Fiche.clasS.php fix broken merge
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 69/173: Fiche.clasS.php fix broken merge |
Date: |
Mon, 22 Mar 2021 12:58:45 -0400 (EDT) |
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.
- [Noalyss-commit] [noalyss] 51/173: Mantis #0001666: Export CSV depuis histo ne filtre pas par journal, (continued)
- [Noalyss-commit] [noalyss] 51/173: Mantis #0001666: Export CSV depuis histo ne filtre pas par journal, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 54/173: Merge branch 'r700-currency' of gitlab.noalyss.eu:noalyss/noalyss into r700-currency, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 55/173: mantis #1690: Bug : impossible d'utiliser < dans Inplace_Edit Use base64_decode to protect the string in serialize, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 57/173: Mantis #1643: Déplacement du "bouton" «retour en-haut/calculatrice», Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 60/173: Mantis #0001614: Problème bilans , changement pour bilan ASBL, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 61/173: Mantis #1611: Problème Plan comptable - mise en évidence poste utilisés, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 62/173: Bug : CARD misplace of "Search Card", Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 63/173: Fix bug from merge, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 65/173: Merge issue : inappropriate rollback, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 66/173: Fix Inappropriate merge, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 69/173: Fiche.clasS.php fix broken merge,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 70/173: translate, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 73/173: Php7.2 incompatibility, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 78/173: Merge branch 'entreprise' of gitlab.noalyss.eu:noalyss/noalyss into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 81/173: Merge branch 'dev7109' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 83/173: Merge branch 'dev7109' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 84/173: Cosmetic, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 85/173: Merge branch 'dev7109' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 87/173: Merge branch 'dev7109' into entreprise, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 89/173: Apparence 7.1, Dany De Bontridder, 2021/03/22
- [Noalyss-commit] [noalyss] 90/173: Improve apparence, Dany De Bontridder, 2021/03/22