2
0
forked from Wavyzz/dolibarr
Commit Graph

1287 Commits

Author SHA1 Message Date
Laurent Destailleur
48d7378282 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/comm/action/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/filefunc.inc.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/langs/ar_IQ/bills.lang
	htdocs/langs/ar_IQ/cashdesk.lang
	htdocs/langs/ar_IQ/modulebuilder.lang
	htdocs/langs/ar_IQ/partnership.lang
	htdocs/langs/ar_IQ/propal.lang
	htdocs/langs/ar_IQ/stocks.lang
	htdocs/langs/ar_IQ/ticket.lang
	htdocs/langs/en_AE/admin.lang
	htdocs/langs/en_US/receptions.lang
	htdocs/langs/en_ZA/admin.lang
	htdocs/product/stock/class/mouvementstock.class.php
	htdocs/reception/class/reception.class.php
2021-11-19 23:14:39 +01:00
Laurent Destailleur
e609622f2b Fix test on verifCond for value 0 2021-11-18 13:17:48 +01:00
Laurent Destailleur
a755c7ba51 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-11-11 18:34:41 +01:00
Laurent Destailleur
f5a7275077 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/takepos/index.php
2021-11-11 18:34:04 +01:00
Laurent Destailleur
0021381201 Fix #yogosha7605 2021-11-11 17:08:35 +01:00
Laurent Destailleur
3ff880aa74 Avoid virus detection 2021-11-08 11:40:40 +01:00
Laurent Destailleur
cb65903537 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/langs/en_US/bills.lang
2021-11-08 03:09:30 +01:00
Laurent Destailleur
2fc05a4c1c Add test virus file 2021-11-08 00:37:42 +01:00
Laurent Destailleur
bea85db413 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-31 17:20:09 +01:00
Laurent Destailleur
dbf330b49c Comment on test 2021-10-31 17:17:21 +01:00
Laurent Destailleur
4f2cd2ba18 FIx #19227 2021-10-31 15:59:03 +01:00
Laurent Destailleur
20c874d441 Fix escape sql params. 2021-10-25 18:48:44 +02:00
Laurent Destailleur
dc1226b116 Fix #yogosha7508 2021-10-25 18:40:19 +02:00
Laurent Destailleur
ee4276e0aa Error message 2021-10-04 19:03:14 +02:00
Laurent Destailleur
3d4bb66853 Clean code 2021-09-30 15:59:47 +02:00
Laurent Destailleur
608b6f5fa3 Clean code 2021-09-30 15:24:57 +02:00
Laurent Destailleur
7c5dfa0ad2 Fix language files 2021-09-28 16:47:09 +02:00
Laurent Destailleur
80165811e0 Clean code 2021-09-27 15:50:19 +02:00
Laurent Destailleur
d4cc60640b Clean code 2021-09-27 15:41:58 +02:00
Laurent Destailleur
e965d6d6f2 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/pdf.php
	htdocs/api/class/api_access.class.php
2021-09-03 11:02:21 +02:00
Laurent Destailleur
b04ea59a51 More sql sanitizing 2021-09-02 13:58:42 +02:00
Laurent Destailleur
cac1a7ba5f Fix sql request when using encrypt 2021-09-02 13:45:44 +02:00
Laurent Destailleur
e22bd5c048 Fix better format address for jp in romaji 2021-09-02 10:39:56 +02:00
Laurent Destailleur
5c5b429dec Better error management of client WS unit test 2021-08-28 05:33:19 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Laurent Destailleur
3b6559b1a6 Clean code by adding cast int. 2021-08-27 18:53:45 +02:00
Laurent Destailleur
2f225ee7e5 Clean code by adding cast int. 2021-08-27 16:33:03 +02:00
Laurent Destailleur
dc006b0ebb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.form.class.php
2021-08-23 19:44:02 +02:00
Laurent Destailleur
bfbde54a90 Fix phpcs 2021-08-23 19:38:59 +02:00
Laurent Destailleur
8485fee5f9 Cast numeric into on sql request 2021-08-23 19:33:24 +02:00
Laurent Destailleur
23829ae637 Cast numeric into on sql request 2021-08-23 18:56:46 +02:00
Laurent Destailleur
6d5329bbf8 Fix phpunit 2021-08-23 17:45:16 +02:00
Laurent Destailleur
d4b5ee6c85 Fix cast into variable into sql request. 2021-08-23 17:41:11 +02:00
Laurent Destailleur
4460206709 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-23 16:04:16 +02:00
Laurent Destailleur
d46dfd017a FIX #yogosha6944 Protection against traversal path. 2021-08-23 16:00:03 +02:00
Laurent Destailleur
58fa0740c3 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/langs/en_US/errors.lang
2021-08-22 01:41:18 +02:00
Laurent Destailleur
b3043ab3d6 Fix phpunit 2021-08-22 01:20:25 +02:00
Laurent Destailleur
758b7c404f Doc 2021-08-17 14:12:57 +02:00
Laurent Destailleur
2fc8a80070 Merge pull request #17883 from marc-dll/develop_NEW_holiday_cron
NEW: holiday: handle monthly balance updates with cronjob
2021-07-16 12:48:12 +02:00
Laurent Destailleur
0637ef781f Add samples for imap functions test 2021-07-15 23:03:24 +02:00
Laurent Destailleur
e1a45df0d8 Fix phpunit 2021-07-06 16:12:11 +02:00
Laurent Destailleur
3dff7e29cc Fix #yogosha6567 2021-07-06 01:44:05 +02:00
Laurent Destailleur
0dfa7bdbcc Add option MAIN_RESTRICTHTML_ONLY_VALID_HTML 2021-07-06 00:47:43 +02:00
Laurent Destailleur
df1d1209f4 Fix phpunit 2021-07-05 22:57:27 +02:00
Laurent Destailleur
f8eadf6fe1 Fix #yogosha6561 2021-07-05 22:42:48 +02:00
Laurent Destailleur
f648185839 Fix phpcs 2021-07-05 17:34:25 +02:00
Laurent Destailleur
8b07e99e05 Fix for ' inserted by CKEditor instead of ' 2021-07-05 16:08:47 +02:00
Laurent Destailleur
bda36337cd Prepare fix #yogosha6443 2021-06-30 17:22:36 +02:00
Laurent Destailleur
d379151da6 Fix doc 2021-06-29 19:19:38 +02:00
Laurent Destailleur
796b2d201a Enhance the sanitizing. 2021-06-29 18:17:27 +02:00