[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 09/27: fixup! fixup! New Task 1728: Aide à l
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 09/27: fixup! fixup! New Task 1728: Aide à l'encodage - Journaux négatifs (note de crédit) |
Date: |
Wed, 4 Sep 2019 15:24:53 -0400 (EDT) |
sparkyx pushed a commit to branch master
in repository noalyss.
commit 98c3a84b161b539ba0aba004c731caf5533eb92b
Author: Dany De Bontridder <address@hidden>
Date: Thu Aug 29 00:04:42 2019 +0200
fixup! fixup! New Task 1728: Aide à l'encodage - Journaux négatifs (note de
crédit)
---
include/class/acc_ledger.class.php | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/include/class/acc_ledger.class.php
b/include/class/acc_ledger.class.php
index 165f792..bf72b57 100644
--- a/include/class/acc_ledger.class.php
+++ b/include/class/acc_ledger.class.php
@@ -2357,10 +2357,12 @@ class Acc_Ledger extends jrn_def_sql
{
throw new Exception(_('Choix du type de journal est
obligatoire'));
}
- if ($negative_amount == 1 && trim($negative_warning)=="") {
+ if (isset( $negative_warning) && $negative_amount == 1 &&
trim($negative_warning)=="") {
+
throw new Exception(_("Avertissement ne peut être vide"));
}
- if ( $negative_amount <> 0 && $negative_amount <> 1 ){
+ if ( isset( $negative_amount) && $negative_amount <> 0 &&
$negative_amount <> 1 ){
+
throw new Exception(_("Valeur invalide"));
}
}
@@ -2391,8 +2393,8 @@ class Acc_Ledger extends jrn_def_sql
$this->jrn_deb_max_line=($min_row<1)?1:$min_row;
$this->jrn_def_description=$p_description;
$this->jrn_enable=$jrn_enable;
- $this->jrn_def_negative_amount=$negative_amount;
- $this->jrn_def_negative_warning=$negative_warning;
+
$this->jrn_def_negative_amount=(isset($negative_amount))?$negative_amount:'0';
+ $this->jrn_def_negative_warning=(isset
($negative_warning))?$negative_warning:_("Attention, ce journal doit utiliser
des montants négatifs");
switch ($this->jrn_def_type)
{
- [Noalyss-commit] [noalyss] branch master updated (aabcd83 -> c249f39), Dany De Bontridder, 2019/09/04
- [Noalyss-commit] [noalyss] 03/27: changement de texte, Dany De Bontridder, 2019/09/04
- [Noalyss-commit] [noalyss] 04/27: Translation & text, Dany De Bontridder, 2019/09/04
- [Noalyss-commit] [noalyss] 06/27: Security : avoid direct call to Http Variable, Dany De Bontridder, 2019/09/04
- [Noalyss-commit] [noalyss] 08/27: New : icon_action:slider icon_action:comment and fix single quote issue in icon_action:tips, Dany De Bontridder, 2019/09/04
- [Noalyss-commit] [noalyss] 09/27: fixup! fixup! New Task 1728: Aide à l'encodage - Journaux négatifs (note de crédit),
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 18/27: #0001735: icone add catégorie de fiche, Dany De Bontridder, 2019/09/04
- [Noalyss-commit] [noalyss] 12/27: #1369: Étendre la comptabilité analytique à tous les postes? #1716: GROS SOUCI CA - ventilation 4 et 5. 5 phantôme! #1479: PROPOSITION CA - paramétrage comptes actifs, Dany De Bontridder, 2019/09/04
- [Noalyss-commit] [noalyss] 20/27: Task #0001731: Moyen de paiement , bug in ajax , if ledger==ODS a category of card is mandatory, Dany De Bontridder, 2019/09/04
- [Noalyss-commit] [noalyss] 21/27: Data_SQL Add database indication, Dany De Bontridder, 2019/09/04
- [Noalyss-commit] [noalyss] 02/27: Task #0001736: PHP7 comptability : count() works only with array, Dany De Bontridder, 2019/09/04
- [Noalyss-commit] [noalyss] 26/27: Database_Core add function with the number of cols, Dany De Bontridder, 2019/09/04
- [Noalyss-commit] [noalyss] 07/27: #0001584: En mode «optionnelle», afficher si CA ventilée ou non. Ajout symbole "contient", Dany De Bontridder, 2019/09/04
- [Noalyss-commit] [noalyss] 11/27: layout, Dany De Bontridder, 2019/09/04
- [Noalyss-commit] [noalyss] 27/27: Merge branch 'dev7109', Dany De Bontridder, 2019/09/04
- [Noalyss-commit] [noalyss] 05/27: Security : avoid direct call to Http Variable, Dany De Bontridder, 2019/09/04