Commit graph

68 commits

Author SHA1 Message Date
Dany De Bontridder
b9c1bdfa3e Merge branch 'dev7400-1' into next-release-8 2020-07-17 11:50:04 +02:00
Dany De Bontridder
800b4139ad Improve : logging error 2020-07-11 19:01:42 +02:00
Dany De Bontridder
b025f0075f Improve error log 2020-07-01 00:24:05 +02:00
Dany De Bontridder
9c40c9df68 Error : duplicate function update_row 2020-06-07 19:24:47 +02:00
Dany De Bontridder
99b6d77a10 Install show choosen password for admin 2020-06-07 15:19:01 +02:00
Dany De Bontridder
1f7610b894 task #0001801: CARD : mise à jour fiche , effacement et modification 2020-06-02 14:32:04 +02:00
Dany De Bontridder
f65faea43a Merge branch 'dev7220' into entreprise 2020-04-04 14:04:17 +02:00
Dany De Bontridder
71a063a31d Task #1756: Avertissement qcode 2020-02-26 22:43:01 +01:00
Dany De Bontridder
8ca0bc287b Improve Scenario Test 2019-10-26 16:36:50 +02:00
Dany De Bontridder
9e55774ca3 Improve Scenario Test 2019-10-26 16:33:29 +02:00
Dany De Bontridder
3dfe784137 Merge branch 'accept7100' into entreprise 2019-09-24 19:53:36 +02:00
Dany De Bontridder
1aa7a44e9a Esthetic correct column 2019-09-24 19:49:24 +02:00
Dany De Bontridder
860d94045c Task #0001698: Problème affichage historique fiches 2019-09-19 14:23:41 +02:00
Dany De Bontridder
b4eb763bdc Task #0001698: Problème affichage historique fiches 2019-09-19 14:03:14 +02:00
Dany De Bontridder
0030779e71 Merge branch 'dev7109' into entreprise
# Conflicts:
#	html/install.php
#	include/class/acc_ledger.class.php
#	include/class/noalyss_parameter_folder.class.php
#	include/company.inc.php
2019-09-12 21:57:47 +02:00
Dany De Bontridder
68d8ff57d9 Fiche Cosmetic : 2019-09-09 08:17:30 +02:00
Dany De Bontridder
f006539934 Fiche:GetByDef if nothing is found returns empty array 2019-09-09 08:15:51 +02:00
Dany De Bontridder
6872a81d8b Merge branch 'dev7109' into entreprise 2019-08-26 15:50:46 +02:00
Dany De Bontridder
5aab6a0502 Bug : Database::fetch_all returns an array or FALSE, because
of pg_fetch_all, the version PHP7 cannot use anymore a boolean with
count().
2019-08-24 12:05:49 +02:00
Dany De Bontridder
f275796e2e Merge branch 'master' into entreprise 2019-07-29 12:24:54 +02:00
Dany De Bontridder
6d51017528 Merge with dev7109 2019-07-29 11:53:39 +02:00
Dany De Bontridder
2c51a53a1e Merge branch 'master' of gitlab.noalyss.eu:noalyss/noalyss 2019-07-29 11:01:25 +02:00
Dany De Bontridder
35e3de4c7c Documentation : automatic format breaks doxygen tag 2019-07-27 20:03:46 +02:00
Dany De Bontridder
aa9fe14bf0 Card : allow to specify the max displaid rows 2019-07-22 21:37:16 +02:00
Dany De Bontridder
27f5673f2d Bug : card cannot use a attribute of the type "card", reason : the query was
wrong and there were a confusion between this->name and this->id in "get_js_attr()"
2019-07-22 21:22:16 +02:00
Dany De Bontridder
7add131124 Fix bug : SQL Error in fiche.inc.php due to merge 2019-02-07 10:49:31 +01:00
Dany De Bontridder
513424f27f CARD : broken merge 2019-02-04 09:12:39 +01:00
Dany De Bontridder
31d3c6927f Fiche.clasS.php fix broken merge 2019-02-03 22:09:55 +01:00
Dany De Bontridder
445dbdf9cb Fiche.clasS.php fix broken merge 2019-02-03 22:09:34 +01:00
Dany De Bontridder
cc1a98458b Fix broken merge 2019-02-03 21:49:59 +01:00
Dany De Bontridder
ab79b9f1e5 Wrong merge broke fiche.class.php 2019-02-03 21:46:01 +01:00
Dany De Bontridder
9862b47e1a Wrong merge broke fiche.class.php 2019-02-03 21:26:30 +01:00
Dany De Bontridder
474b5425ab Fix Inappropriate merge 2019-02-03 20:37:21 +01:00
Dany De Bontridder
f39d9caec9 Bug merge 2019-02-03 16:34:09 +01:00
Dany De Bontridder
14f4fd81f1 Merge issue : inappropriate rollback 2019-02-03 16:15:56 +01:00
Dany De Bontridder
09227d2cc9 Merge issue : inappropriate rollback 2019-02-03 16:15:06 +01:00
Dany De Bontridder
dc150ce610 Fix bug from merge 2019-02-03 15:55:18 +01:00
Dany De Bontridder
634e89a2b0 Mantis #1611: Problème Plan comptable - mise en évidence poste utilisés 2019-02-03 15:41:39 +01:00
Dany De Bontridder
c735b61ad7 Mantis #1611: Problème Plan comptable - mise en évidence poste utilisés 2019-02-03 15:34:13 +01:00
Dany De Bontridder
656b1cfb88 Currency : for misc. operation 2019-01-02 11:18:03 +01:00
Dany De Bontridder
62bce277f2 Currency : error when displaying, add 4 due to a mistype instruction 2018-12-09 17:20:21 +01:00
Dany De Bontridder
b2ab12f8c9 Currency : export CSV history for card and accounting, fix bug
with unneeded oc_vat_amount + add the currency rate
2018-12-09 11:21:48 +01:00
Dany De Bontridder
7280cfd320 Currency : cosmetic display history : show only the value of the card/accounting 2018-12-09 11:12:28 +01:00
Dany De Bontridder
3c93e7491e Currency : ledger printing for FIN + detail operation 2018-12-06 10:50:16 +01:00
Dany De Bontridder
dd8bc6750f Currency : adapt for bank saldo 2018-11-30 15:20:27 +01:00
Dany De Bontridder
845c0b29f9 adapt to 7.2 ,error with sizeof 2018-10-20 11:36:14 +02:00
Dany De Bontridder
7c74247408 adapt to 7.2 ,error with sizeof 2018-10-20 09:20:44 +02:00
Dany De Bontridder
f5f5e55296 Bug 1600 : alphanumeric accounting must be case insensitive 2018-06-17 17:56:54 +02:00
Dany De Bontridder
f8db1e508c Task #448 : add info about currency into History
of cards and accounting
2018-05-16 14:20:40 +02:00
Dany De Bontridder
4f9be5373f Bug 1600 : alphanumeric accounting must be case insensitive 2018-05-08 22:40:31 +02:00