[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 63/162: Merge branch 'master' into r700-curre
From: |
Dany De Bontridder |
Subject: |
[Noalyss-commit] [noalyss] 63/162: Merge branch 'master' into r700-currency |
Date: |
Sat, 11 Jul 2020 13:23:37 -0400 (EDT) |
sparkyx pushed a commit to annotated tag E-4
in repository noalyss.
commit 457290f4e2a07a8a06123123f87d82091b7dbac0
Merge: 4ca14cb f19a96a
Author: Dany De Bontridder <danydb@noalyss.eu>
AuthorDate: 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] 40/162: Fix bug quant_purchase , private fee not saved, (continued)
- [Noalyss-commit] [noalyss] 40/162: Fix bug quant_purchase , private fee not saved, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 44/162: Task #448 : add info about currency into History of cards and accounting, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 47/162: Update documentation, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 54/162: Fix todo_list : if list empty , gets an error in php 7.2, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 49/162: New version of libreoffice use the numeric in another way, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 51/162: Missing class : missing class for acc_ledger, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 53/162: integrate fix for bug in insert_quant_purchase which cannot save private fee Conflicts: include/sql/patch/upgrade128.sql, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 58/162: Security fix : f_id is a number, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 60/162: translation, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 61/162: CFGLED : security fix : remove $_REQUEST, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 63/162: Merge branch 'master' into r700-currency,
Dany De Bontridder <=
- [Noalyss-commit] [noalyss] 64/162: Remove the default "<div class=content>" which lead to cosmetic bug in the plugins, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 65/162: Documentation, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 69/162: Check for date and number : isdate and isnumeric, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 71/162: Improve waiting box, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 72/162: Bug : cannot set group, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 75/162: Bug : in Purchase and Sale , the last rows disappear when we change the ledger, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 66/162: Documentation, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 67/162: Create lib for Tabs, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 68/162: Merge tag 'rel7008' into r700-currency, Dany De Bontridder, 2020/07/11
- [Noalyss-commit] [noalyss] 70/162: Merge branch 'master' into r700-currency, Dany De Bontridder, 2020/07/11