[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 65/238: Merge branch 'master' into r700-curre
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 65/238: Merge branch 'master' into r700-currency |
Date: |
Sat, 26 Oct 2019 04:40:34 -0400 (EDT) |
sparkyx pushed a commit to annotated tag rel7110
in repository noalyss.
commit 457290f4e2a07a8a06123123f87d82091b7dbac0
Merge: 4ca14cb f19a96a
Author: Dany De Bontridder <address@hidden>
Date: Sun Jun 17 18:49:14 2018 +0200
Merge branch 'master' into r700-currency
Conflicts:
include/class/acc_ledger.class.php
include/constant.php
include/export/export_fiche_balance_csv.php
include/lib/http_input.class.php
sql/upgrade.sql
include/cfgledger.inc.php | 2 ++
include/lib/http_input.class.php | 6 ++++--
sql/upgrade.sql | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --cc sql/upgrade.sql
index 5449b50,f3340f5..5334158
--- a/sql/upgrade.sql
+++ b/sql/upgrade.sql
@@@ -53,4 -52,4 +52,5 @@@ begi
p_price_unit);
return;
end;
++ $function$
$function$
- [Noalyss-commit] [noalyss] 43/238: Missing ob_start, (continued)
- [Noalyss-commit] [noalyss] 43/238: Missing ob_start, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 41/238: Fix bug quant_purchase , private fee not saved, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 44/238: Task #448 : add info about currency into History of cards and accounting, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 46/238: Merge branch 'r700-currency' of ssh://ns3git/srv/git/noalyss into r700-currency, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 50/238: Protect function nb , return the string if the parameter is not a float, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 53/238: Missing class : missing class for acc_ledger, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 51/238: New version of libreoffice use the numeric in another way, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 45/238: Fix todo_list : if list empty , gets an error in php 7.2, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 47/238: typo, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 52/238: Create invoice : New version of libreoffice use the numeric in another way, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 65/238: Merge branch 'master' into r700-currency,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 68/238: Documentation, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 76/238: Bug : cannot set group, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 37/238: comment, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 40/238: Fix bug quant_purchase , private fee not saved, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 48/238: Task #448 : add currency to card -> history + export CSV, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 58/238: Fix : security fixes see rapport exakat (Damien Seguy), Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 62/238: translation, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 64/238: Merge master, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 59/238: Security fix : f_id is a number, Dany De Bontridder, 2019/10/26
- [Noalyss-commit] [noalyss] 74/238: Merge branch 'r700-currency' of gitlab.noalyss.eu:noalyss/noalyss into r700-currency, Dany De Bontridder, 2019/10/26