[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 188/238: Fix broken merge
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 188/238: 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 cc1a98458ba3a36487b22b9852fe985b6a053bbe
Author: Dany De Bontridder <address@hidden>
Date: Sun Feb 3 21:49:59 2019 +0100
Fix broken merge
---
include/class/fiche.class.php | 1 +
1 file changed, 1 insertion(+)
diff --git a/include/class/fiche.class.php b/include/class/fiche.class.php
index df2df49..2224314 100644
--- a/include/class/fiche.class.php
+++ b/include/class/fiche.class.php
@@ -802,6 +802,7 @@ class Fiche
{
if (strlen(trim($value))==0)
$value="pas de nom";
+ $account_name=$value;
}
// account
if ($id==ATTR_DEF_ACCOUNT)
- [Noalyss-commit] [noalyss] 157/238: Merge branch 'r700-currency' of gitlab.noalyss.eu:noalyss/noalyss into r700-currency, (continued)
- [Noalyss-commit] [noalyss] 157/238: Merge branch 'r700-currency' of gitlab.noalyss.eu:noalyss/noalyss into r700-currency, Dany De Bontridder, 2019/10/26
- [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 <=
- [Noalyss-commit] [noalyss] 189/238: Fiche.clasS.php fix broken merge, Dany De Bontridder, 2019/10/26
- [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