[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 188/218: Fix broken merge
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 188/218: Fix broken merge |
Date: |
Thu, 12 Sep 2019 15:59:07 -0400 (EDT) |
sparkyx pushed a commit to branch entreprise
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] 160/218: Protect parameters, (continued)
- [Noalyss-commit] [noalyss] 160/218: Protect parameters, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 167/218: Currency : set default accounting for change difference when using currency, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 165/218: Database upgrade, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 168/218: translation, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 169/218: Mantis #0001688: Affichage centime dans l'écran de confirmation, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 176/218: Mantis #1626: AFFICHAGE BALANCE FICHE - soldes nuls au débit, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 177/218: Mantis #1643: Déplacement du "bouton" «retour en-haut/calculatrice», Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 184/218: CSS : cosmetic, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 185/218: Merge issue : inappropriate rollback, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 186/218: Fix Inappropriate merge, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 188/218: Fix broken merge,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 181/218: Mantis #1611: Problème Plan comptable - mise en évidence poste utilisés, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 198/218: Merge branch 'entreprise' of gitlab.noalyss.eu:noalyss/noalyss into entreprise, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 200/218: Merge branch 'master' into entreprise, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 212/218: Periode : when searching for a ledger , you can set a periode, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 209/218: PDFLand has now his own file, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 210/218: Data_SQL database connexion private, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 216/218: Version set to 7.1, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 202/218: Merge branch 'dev7109' into entreprise, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 162/218: Currency - fix view, Dany De Bontridder, 2019/09/12
- [Noalyss-commit] [noalyss] 178/218: Mantis #1665: Pouvoir modifier l'ordre dans les listing de compta analytique, Dany De Bontridder, 2019/09/12