[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 189/238: Fiche.clasS.php fix broken merge
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 189/238: Fiche.clasS.php fix broken merge |
Date: |
Sat, 26 Oct 2019 04:41:01 -0400 (EDT) |
sparkyx pushed a commit to annotated tag rel7110
in repository noalyss.
commit 445dbdf9cb1156f9844c542668c8a1268407b070
Author: Dany De Bontridder <address@hidden>
Date: 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] 162/238: Currency - fix view, (continued)
- [Noalyss-commit] [noalyss] 162/238: Currency - fix view, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 150/238: Currency : detail operation Sale , the amount in currency were wrong in the summary, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 165/238: Database upgrade, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 158/238: Merge branch 'master' of gitlab.noalyss.eu:noalyss/noalyss into r700-currency, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 167/238: Currency : set default accounting for change difference when using currency, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 159/238: Currency : because of Misc Operation, the tiers must also be saved into operation_currency. Fix also PRINTJRN for currency, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 173/238: Mantis #0001682: CA - ajouter possibilité d'exporter le plan analytique, missing file, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 177/238: Mantis #1643: Déplacement du "bouton" «retour en-haut/calculatrice», Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 182/238: Bug : CARD misplace of "Search Card", Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 188/238: Fix broken merge, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 189/238: Fiche.clasS.php fix broken merge,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 191/238: Cosmetic adapt color, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 179/238: Mantis #1596: Dans le plan comptable, fiches non cliquables Les fiches sont cliquable dans Plan Comptable , PCMNCFG et dans la liste des postes, en plus on peut obtenir toutes les fiches d'un poste, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 175/238: mantis #1690: Bug : impossible d'utiliser < dans Inplace_Edit Use base64_decode to protect the string in serialize, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 196/238: Mantis #1693: CA - problème avec la balance croisée double, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 212/238: Merge branch 'accept7100' into entreprise, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 208/238: Merge branch 'dev7109' into entreprise, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 221/238: task #0001698: Problème affichage historique fiches Prevent direct use of http_request translation Cosmetic, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 180/238: Mantis #0001614: Problème bilans , changement pour bilan ASBL, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 205/238: Merge branch 'dev7109' into entreprise, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 220/238: Merge branch 'entreprise' of gitlab.noalyss.eu:noalyss/noalyss into entreprise * index.css logo size, Dany De Bontridder, 2019/10/26