Commit Graph

1338 Commits

Author SHA1 Message Date
Laurent Destailleur
757a186b3c Fix phpunit 2021-03-29 23:43:07 +02:00
Laurent Destailleur
a4987c6e4f
Merge branch 'develop' into 14a22 2021-03-29 20:35:35 +02:00
Laurent Destailleur
4cacca413e FIX #yogosha5757 2021-03-29 14:43:40 +02:00
Alexandre SPANGARO
2a1cc04b66 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-03-28 06:16:33 +02:00
Laurent Destailleur
a1366da130 FIX #yogosha5715 2021-03-23 03:45:17 +01:00
Laurent Destailleur
6063b02bf4 Fix #ygosha5698 2021-03-22 12:47:23 +01:00
Laurent Destailleur
6a0e0f4c06 Fix #ygosha5698 2021-03-22 12:10:51 +01:00
Laurent Destailleur
e334e83a64
Merge branch 'develop' into 14a22 2021-03-20 13:42:54 +01:00
Laurent Destailleur
35869f1449 Add function dol_string_onlythesehtmlattributes() and option
MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES to enable it.
2021-03-17 21:39:28 +01:00
Laurent Destailleur
e366d2c379 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/admin/tools/export_files.php
	htdocs/compta/paiement_charge.php
	htdocs/compta/sociales/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/cron/list.php
	htdocs/filefunc.inc.php
	test/phpunit/FilesLibTest.php
2021-03-16 14:57:04 +01:00
Laurent Destailleur
ceba8146c6 Fix phpunit 2021-03-16 12:40:20 +01:00
Alexandre SPANGARO
6e17a588bb Merge remote-tracking branch 'upstream/develop' into 14a22 2021-03-16 03:26:28 +01:00
Laurent Destailleur
614720fc0a FIX #16671 Can not generate zip file of documents in backup tool 2021-03-15 14:51:36 +01:00
Laurent Destailleur
ded3beee71 Disallow use of &# into dol_sanitizeUrl() 2021-03-14 20:37:59 +01:00
Laurent Destailleur
9aa8916a9c Disallow use of &# into dol_sanitizeUrl() 2021-03-14 20:35:55 +01:00
Laurent Destailleur
45579edd43 Enhance WAF and dol_sanitizeUrl 2021-03-14 18:57:18 +01:00
Laurent Destailleur
4965ce8768 Fix method to sanitize an URL 2021-03-14 16:14:24 +01:00
Laurent Destailleur
74a61d559f FIX sanitizing with GETPOST(alphanohtml) #yogosha5629 2021-03-14 15:39:59 +01:00
Laurent Destailleur
72766c830d FIX #Yogosha5631 2021-03-14 15:06:40 +01:00
Laurent Destailleur
95006ec94c Fix sanitizing backtopage 2021-03-14 12:58:37 +01:00
Laurent Destailleur
0a542ad9f9 Fix redirect to external website. Bad sanitizing of backtopage parameter 2021-03-14 11:38:42 +01:00
Laurent Destailleur
ff2f93815f Fix backtourl 2021-03-13 12:33:26 +01:00
Laurent Destailleur
0a0bb92689 Fix phpcs 2021-03-06 11:37:23 +01:00
Laurent Destailleur
3cbced439a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/tools/listevents.php
	htdocs/compta/bank/line.php
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/paiement/cheque/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/ticket.lib.php
	htdocs/core/modules/mailings/modules_mailings.php
	htdocs/core/tpl/extrafields_view.tpl.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/cron/list.php
	htdocs/expedition/card.php
	htdocs/mrp/mo_list.php
	htdocs/product/stock/productlot_card.php
	htdocs/public/emailing/mailing-read.php
	htdocs/public/emailing/mailing-unsubscribe.php
	htdocs/ticket/list.php
	test/phpunit/FactureRecTest.php
2021-03-05 19:29:09 +01:00
Laurent Destailleur
6503c81f47 FIX #16530 2021-03-03 23:55:28 +01:00
Laurent Destailleur
5f8b52ffc9 Code comment 2021-03-03 12:05:43 +01:00
Laurent Destailleur
348b8d2ffe More phpunit tests 2021-03-02 23:55:41 +01:00
Laurent Destailleur
9f4bdd86b4 More robust test 2021-03-02 23:48:33 +01:00
Laurent Destailleur
592dacd849 Fix phpcs 2021-03-02 02:45:39 +01:00
Laurent Destailleur
0670a00b83 Fix phpcs 2021-03-02 02:06:09 +01:00
Laurent Destailleur
1cdea45707 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/adherents/subscription/list.php
	htdocs/societe/canvas/company/tpl/card_create.tpl.php
	htdocs/societe/canvas/individual/tpl/card_create.tpl.php
	htdocs/societe/card.php
2021-03-01 17:46:36 +01:00
Laurent Destailleur
222012da37 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/bank/class/paymentvarious.class.php
	htdocs/compta/bank/various_payment/card.php
	htdocs/don/card.php
	htdocs/langs/en_US/main.lang
	htdocs/public/payment/newpayment.php
	test/phpunit/DateLibTzFranceTest.php
2021-03-01 15:48:30 +01:00
Alexandre SPANGARO
94a861c1c8 Code enhanced - Standardize field name 2021-03-01 04:07:31 +01:00
Frédéric FRANCE
1b046f25cf
add new rule 2021-03-01 00:19:52 +01:00
Laurent Destailleur
3e52c33bde Fix manual phpunit 2021-02-28 22:52:41 +01:00
Laurent Destailleur
490faec547 FIX Timezone problems
Conflicts:
	htdocs/core/lib/date.lib.php
	test/phpunit/DateLibTest.php
2021-02-28 22:50:21 +01:00
Laurent Destailleur
ae81ab0c7c FIX Timezone problems 2021-02-28 22:44:11 +01:00
Laurent Destailleur
f5406d487b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/class/html.formmail.class.php
	htdocs/core/lib/product.lib.php
	htdocs/product/stock/productlot_card.php
	test/phpunit/SecurityTest.php
2021-02-26 12:53:06 +01:00
Laurent Destailleur
b7e2c7d87a FIX #16393 Do not sanitize <!DOCTYPE html> 2021-02-23 12:58:43 +01:00
Frédéric FRANCE
398048da04
fix tests 2021-02-21 16:10:35 +01:00
Frédéric FRANCE
9ef56b53f2
fix tests 2021-02-21 16:05:59 +01:00
Frédéric FRANCE
5ceb8163de
fix tests 2021-02-21 15:40:03 +01:00
Frédéric FRANCE
6e3a1a1d41
fix tests 2021-02-21 13:32:54 +01:00
Laurent Destailleur
712c2f20df Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.form.class.php
2021-02-19 22:06:48 +01:00
Laurent Destailleur
7fb93f39b4 Code comment 2021-02-19 17:59:22 +01:00
Frédéric FRANCE
79c3670c20
doxygen 2021-02-11 21:12:32 +01:00
Laurent Destailleur
c9b296ed57 Remove bad use 2021-02-10 13:51:18 +01:00
Frédéric FRANCE
ae192bf4c9
doxygen 2021-02-10 08:47:22 +01:00
Frédéric FRANCE
4c17fefb95
Update CompanyBankAccountTest.php 2021-02-09 23:54:53 +01:00
Frédéric FRANCE
9db3499aef
Update CommonInvoiceTest.php 2021-02-09 23:52:53 +01:00
Frédéric FRANCE
db8afec96b
Update CommandeTest.php 2021-02-09 23:51:49 +01:00
Frédéric FRANCE
763b8f071e
Update CommandeFournisseurTest.php 2021-02-09 23:50:40 +01:00
Frédéric FRANCE
f1ce1ed9c8
Update BankAccountTest.php 2021-02-09 23:48:28 +01:00
Frédéric FRANCE
62bfb73423
Update ActionCommTest.php 2021-02-09 23:46:26 +01:00
Frédéric FRANCE
7bbd89393a
doxygen 2021-02-09 23:45:23 +01:00
Laurent Destailleur
89bda722bf
Merge pull request #16232 from frederic34/paymentvat
use camelCaps name
2021-02-09 13:29:40 +01:00
Frédéric FRANCE
f394e55ade
deprecate non camelCaps functions 2021-02-09 10:26:17 +01:00
Frédéric FRANCE
148bbb3997
clean deprecated modelpdf to model_pdf 2021-02-08 18:30:35 +01:00
Laurent Destailleur
21a9a69ba1 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	test/phpunit/SecurityTest.php
2021-02-04 23:38:42 +01:00
Laurent Destailleur
4a2f26415e Fix GETPOST accept < if followed with a number 2021-02-04 23:36:41 +01:00
Laurent Destailleur
6e7e8d7d36 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	test/phpunit/CodingPhpTest.php
2021-02-03 23:26:08 +01:00
Laurent Destailleur
c3b409df31 Fix do not use CURDATE() 2021-02-03 23:18:44 +01:00
Laurent Destailleur
f301635681 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/html.formmail.class.php
2021-02-03 21:02:32 +01:00
Laurent Destailleur
9ac2dc1a6e Fix phpcs 2021-02-03 20:42:30 +01:00
Laurent Destailleur
2e7de1d137 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/commande/card.php
	test/phpunit/ExportTest.php
2021-02-02 16:17:53 +01:00
Laurent Destailleur
c7a4baf7c5 Fix phpunit export excel2007 2021-02-02 16:14:40 +01:00
Laurent Destailleur
d7bf173f0d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/core/lib/functions.lib.php
	test/phpunit/SecurityTest.php
2021-01-26 12:12:35 +01:00
Laurent Destailleur
13378897a8 FIX Report by Ricardo Matias
Conflicts:
	test/phpunit/SecurityTest.php
2021-01-25 22:52:30 +01:00
Laurent Destailleur
6a12de741f FIX Report by Ricardo Matias 2021-01-25 22:46:09 +01:00
Frédéric FRANCE
177b87da0d
Merge remote-tracking branch 'upstream/develop' into codesyntax 2021-01-16 17:58:01 +01:00
Laurent Destailleur
329499c103 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-16 16:43:00 +01:00
Laurent Destailleur
2cecd449cf Fix phpcs 2021-01-16 16:41:59 +01:00
Laurent Destailleur
16333b911a Fix phpunit 2021-01-16 15:57:30 +01:00
Laurent Destailleur
4c3209b64a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-16 14:26:28 +01:00
Laurent Destailleur
4aaf10b4b6 Fix phpunit 2021-01-16 14:25:59 +01:00
Frédéric FRANCE
7e55a71db0
Merge remote-tracking branch 'upstream/develop' into codesyntax 2021-01-14 15:16:27 +01:00
Frédéric FRANCE
b1a1cd4be6
code syntax 2021-01-14 15:09:08 +01:00
Laurent Destailleur
aaddda9a6e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/accountancy/bookkeeping/listbysubaccount.php
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/user/class/usergroup.class.php
2021-01-14 14:13:08 +01:00
Laurent Destailleur
958b255822 Fix #15949 by introducing 'alphawithlgt' as GETPOST possible param. 2021-01-12 21:06:02 +01:00
Laurent Destailleur
07ca12b26d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-06 20:48:23 +01:00
Laurent Destailleur
ca11ea9839 Fix phpunit
Signed-off-by: Laurent Destailleur <eldy@destailleur.fr>
2021-01-06 20:47:57 +01:00
Laurent Destailleur
cefd66c18f Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-29 16:56:39 +01:00
Laurent Destailleur
abca44be0d More logs 2020-12-29 04:52:47 +01:00
Laurent Destailleur
7b93c34c0f Fix phpunits 2020-12-29 03:48:11 +01:00
Laurent Destailleur
cec96b33ae Fix warning 2020-12-28 12:30:59 +01:00
Laurent Destailleur
4a8e72c997 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/ecm/file_card.php
2020-12-27 21:00:07 +01:00
Laurent Destailleur
5aae018a0b Fix for php8 2020-12-27 19:33:07 +01:00
Laurent Destailleur
f8e611d492 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-12-27 19:02:46 +01:00
Laurent Destailleur
f8b179a1be
Merge pull request #15351 from frederic34/patch-13
separate ref and rowid in members
2020-12-27 15:18:55 +01:00
Laurent Destailleur
f20f4cc599 Fix warnings 2020-12-26 19:23:25 +01:00
Laurent Destailleur
11a122176d Clean code 2020-12-24 02:33:11 +01:00
Laurent Destailleur
e9129154e4 Log 2020-12-24 02:16:22 +01:00
Laurent Destailleur
11b15557eb Clean code 2020-12-24 02:09:11 +01:00
Laurent Destailleur
e590fb36ad Log for debug 2020-12-24 01:53:36 +01:00
Laurent Destailleur
9007e7be2a Fix sql for postgresql 2020-12-23 16:13:45 +01:00
Laurent Destailleur
a67068ab7b Fix warnings 2020-12-17 18:08:56 +01:00
Laurent Destailleur
c040002d6e Fix warning 2020-12-17 17:11:25 +01:00
Laurent Destailleur
eed14bd9af Fix warnings 2020-12-17 17:04:42 +01:00
Laurent Destailleur
a5a070705b Add test for phpunit env 2020-12-16 14:53:04 +01:00
Laurent Destailleur
d781d78c4e Fix warning 2020-12-16 12:53:31 +01:00
Laurent Destailleur
371a460905 More PHPUnit for movements 2020-12-16 12:26:01 +01:00
Laurent Destailleur
5facd49a6c Fix warnings 2020-12-16 11:33:31 +01:00
Laurent Destailleur
c6f83aaed7 Fix warning 2020-12-16 11:21:48 +01:00
Laurent Destailleur
02a15e03f7 Fix phpunit 2020-12-16 10:37:34 +01:00
Laurent Destailleur
834058a816 Debug api to create a document 2020-12-16 02:33:21 +01:00
Laurent Destailleur
3d33d3aa3a Fix warning 2020-12-13 14:36:00 +01:00
Laurent Destailleur
3521a736fc Fix warnings 2020-12-12 19:49:13 +01:00
Laurent Destailleur
5f476e7e7e Compatibility of nusoap with PHP8 2020-12-12 15:37:15 +01:00
Laurent Destailleur
1f6f434a9c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/tools/export_files.php
	test/phpunit/SecurityTest.php
2020-12-11 15:56:19 +01:00
Laurent Destailleur
4fcd3fe493 Fix disallow -- string into filename for security purpose. Vulnerability
reported by Yılmaz Değirmenci
2020-12-11 15:12:42 +01:00
Laurent Destailleur
6e403e6ce0 Fix warnings 2020-12-07 18:29:14 +01:00
Laurent Destailleur
4f826fae26 Fix warnings 2020-12-07 12:18:53 +01:00
Laurent Destailleur
030df716a2 Clean dead code: Function showStripePaymentUrl, getStripePaymentUrl,
showPaypalPaymentUrl and getPaypalPaymentUrl has been removed. The
generic one showOnlinePaymentUrl and getOnlinePaymentUrl are always
used.
2020-12-07 11:01:08 +01:00
Laurent Destailleur
8b3edd36ea Fix warning 2020-12-07 10:37:55 +01:00
Laurent Destailleur
abadd2b803 Clean phpunit 2020-12-06 19:33:43 +01:00
Laurent Destailleur
de61a7cfd3 Fix cleaning html tags with trans and with GETPOST. 2020-12-06 17:30:27 +01:00
Frédéric FRANCE
914d2ae7f7
Merge remote-tracking branch 'upstream/develop' into patch-13 2020-12-04 20:40:35 +01:00
Laurent Destailleur
10bef6eb03 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/opensurvey/class/opensurveysondage.class.php
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/card.php
2020-12-04 19:24:29 +01:00
Laurent Destailleur
49db52134b Fix for negative numbers 2020-12-04 18:19:51 +01:00
Laurent Destailleur
6d4a90b543 Clean code 2020-12-04 14:53:52 +01:00
Laurent Destailleur
c8f918265a Removed dead code 2020-12-04 13:25:56 +01:00
Laurent Destailleur
34679c3bc1 Fix warning in phpunit 2020-12-04 13:22:47 +01:00
Laurent Destailleur
7634212811 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/system/phpinfo.php
	htdocs/commande/stats/index.php
	htdocs/compta/facture/stats/index.php
2020-11-29 21:35:03 +01:00
Laurent Destailleur
d3a2aa664f FIX #15572 2020-11-29 20:27:40 +01:00
Laurent Destailleur
4119174ef1 Include sql injection tests into PHPUnit 2020-11-27 16:52:52 +01:00
Laurent Destailleur
657749375f Avoid error 2020-11-27 16:47:13 +01:00
Laurent Destailleur
574919de52 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	.travis.yml
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/adherents/class/subscription.class.php
	htdocs/compta/bank/categ.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/boxes/box_task.php
	htdocs/core/class/commondocgenerator.class.php
	htdocs/core/class/interfaces.class.php
	htdocs/core/lib/project.lib.php
	htdocs/core/modules/modCategorie.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fichinter/class/fichinterrec.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/install/repair.php
	htdocs/main.inc.php
	htdocs/product/price.php
	htdocs/projet/tasks/time.php
	htdocs/reception/card.php
2020-11-27 15:45:12 +01:00
Laurent Destailleur
ac3c129735 Clean code 2020-11-27 14:24:15 +01:00
Frédéric FRANCE
9a2f945807
Merge remote-tracking branch 'upstream/develop' into patch-13 2020-11-27 11:15:10 +01:00
Laurent Destailleur
b6640da281 Fix javascript obfuscating with HTML comments 2020-11-26 23:37:35 +01:00
Laurent Destailleur
b3b511a6d4 FIX #15546 2020-11-26 22:44:11 +01:00
Laurent Destailleur
55f26179f2 Fix phpunit 2020-11-26 08:37:52 +01:00
Laurent Destailleur
944e2a8032 Fix delete of expense report 2020-11-25 15:29:18 +01:00
Laurent Destailleur
4d90fb22de Fix sql syntax error 2020-11-25 15:07:26 +01:00
Frédéric FRANCE
59a2be813e
Update CodingPhpTest.php 2020-11-25 07:56:10 +01:00
Laurent Destailleur
81566289cd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
2020-11-24 11:07:35 +01:00
Laurent Destailleur
53208e620e Use of . as thousand separator. Can use it for decimal if not 3 digits. 2020-11-24 10:56:05 +01:00
Laurent Destailleur
1e70790cd6 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/price.php
2020-11-23 19:55:13 +01:00
Laurent Destailleur
c5278197fb More phpunit test for price2num 2020-11-23 19:45:11 +01:00
Laurent Destailleur
939dfc7ead Add a test to avoid translation "=-" 2020-11-19 14:57:36 +01:00
Frédéric FRANCE
7d6e70c4c0
add log 2020-11-11 13:14:39 +01:00
Laurent Destailleur
e172e82f0c Add unit test 2020-11-08 19:03:37 +01:00
Laurent Destailleur
100edffdaf Fix phpunit 2020-11-08 16:04:54 +01:00
Laurent Destailleur
fe8d93f72d Fix phpcs 2020-11-07 01:17:54 +01:00
Laurent Destailleur
e027d6a433 Ignore field 2020-11-06 16:31:08 +01:00
Laurent Destailleur
e81c18b648 Fix php8 2020-11-06 14:57:30 +01:00
Laurent Destailleur
73e6a00d3e Add more phpunit tests 2020-11-06 13:57:06 +01:00
Laurent Destailleur
61cceba7e2 Removed not used log 2020-11-05 19:32:14 +01:00
Laurent Destailleur
2bc7ca0753 Removed useless verbose logs 2020-11-05 11:56:13 +01:00
Laurent Destailleur
fc08a358e5 Add missing assertion 2020-11-02 11:48:51 +01:00
Laurent Destailleur
f039566abb Fix regression on phpunit 2020-11-01 22:51:55 +01:00
Laurent Destailleur
41965381fd Better compatibility with PHP8 2020-11-01 21:27:56 +01:00
Laurent Destailleur
ce7a96cbf1 Add more assertion 2020-11-01 20:11:09 +01:00
Laurent Destailleur
a27fc22728 Fix phpunit 2020-10-31 16:53:40 +01:00
Laurent Destailleur
9a85441c61 Fix phpcs 2020-10-28 17:06:30 +01:00
Laurent Destailleur
039bc3c412 Fix phpunit 2020-10-27 20:50:33 +01:00
Laurent Destailleur
80d13e711c More secured getURLContent method. Add PHPUnit on getURLContent 2020-10-27 18:02:05 +01:00
Laurent Destailleur
d750dc48a1 More secured getURLContent method. Add PHPUnit on getURLContent 2020-10-27 15:06:16 +01:00
Laurent Destailleur
5b37ff0bfd Html entities use now HTML5. Enhance the Dolibarr WAF. More PHPUnit
tests.
2020-10-15 19:36:08 +02:00
Laurent Destailleur
e8ea7125e5 Removed the FIXME. The dol_getdate can now use a timezone. 2020-10-14 17:11:22 +02:00
Laurent Destailleur
f468c61df3 Fix More powerfull detection of bad use of newToken 2020-10-12 14:04:34 +02:00
Laurent Destailleur
4cf6e483ca Fix export of various payments. 2020-09-28 18:49:20 +02:00
Laurent Destailleur
cde7df8b48 Fix phpunit 2020-09-20 21:33:00 +02:00
Laurent Destailleur
233aa58161 Fix sanitizing 2020-09-20 03:36:02 +02:00
Laurent Destailleur
e5cca13ea0 Fix escaping 2020-09-20 03:32:43 +02:00
Laurent Destailleur
0e4d3c19dd Fix escaping 2020-09-20 02:57:15 +02:00
Laurent Destailleur
f57b4fd2fd Fix escaping 2020-09-20 02:30:53 +02:00
Laurent Destailleur
fa86b62198 Fix escaping 2020-09-20 01:53:24 +02:00
Laurent Destailleur
216b3c885d Fix escaping 2020-09-20 01:30:36 +02:00
Laurent Destailleur
d38168f49e Fix escape 2020-09-19 22:59:04 +02:00
Laurent Destailleur
54c0f742b1 Fix escape 2020-09-19 21:19:04 +02:00
Laurent Destailleur
4a5ee7f04d Better testSqlAndScriptInject (deal htmlentities encoded signatures)
More phpunits on GETPOST
2020-09-19 03:25:25 +02:00
Laurent Destailleur
8d77bfacd2 Fix #yogosha4490 2020-09-18 03:07:13 +02:00
Laurent Destailleur
fa1d14fc7d More complete phpunit 2020-09-18 01:01:01 +02:00
Laurent Destailleur
5744b1e0a3 Fix #yogosha4512 2020-09-17 21:34:31 +02:00
Laurent Destailleur
a895cdcdf8 Fix dol_string_nohtmltag: the decode of entity must be done before split 2020-09-17 21:09:16 +02:00
Laurent Destailleur
cc37f4b29c Clean code. <input name="token" value="$_SESSION['newtoken']" is now
forbidden by CI. You must use newToken().
2020-09-14 16:24:02 +02:00
Laurent Destailleur
0f9b61c33c Test fix phpunit 2020-09-11 14:42:43 +02:00
Laurent Destailleur
c4383747a1 Look and feel v13 2020-09-11 13:57:16 +02:00
Laurent Destailleur
097c5ffaf5 Test 2020-09-09 14:41:04 +02:00
Laurent Destailleur
c9451c0940 Try fix for php 8 2020-09-08 21:25:35 +02:00
Laurent Destailleur
d438116c1e Try fix for php 8 2020-09-08 13:31:05 +02:00
Laurent Destailleur
86ed4dfa2b Debug hidden option MAIN_USE_EXPENSE_IK 2020-09-08 11:51:36 +02:00
Laurent Destailleur
3c6f122a81 Fix phpunit 2020-08-07 14:59:22 +02:00
Laurent Destailleur
91a50038ff Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/prelevement/class/bonprelevement.class.php
	htdocs/compta/prelevement/create.php
	htdocs/compta/prelevement/fiche-stat.php
2020-07-27 19:35:34 +02:00
Laurent Destailleur
e3126ec999 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/tpl/card_presend.tpl.php
	htdocs/multicurrency/class/multicurrency.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-07-25 00:22:47 +02:00
Laurent Destailleur
6261fa191f Prepare compatibilty with mysql 8 2020-07-24 12:47:29 +02:00
Laurent Destailleur
1fb9faeb08 Fix phpcs 2020-07-24 11:57:15 +02:00
Laurent Destailleur
b6308f6dfa Fix phpcs 2020-05-26 01:16:18 +02:00
Frédéric FRANCE
e5402988d9
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-24 17:58:18 +02:00
Laurent Destailleur
fd61214b97 Merge 2020-05-24 01:06:45 +02:00
Laurent Destailleur
3dca55661c Fix Add unit test to avoid the big % instead of comon % char. 2020-05-23 22:01:17 +02:00
Frédéric FRANCE
2085ac73e7
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-23 18:34:58 +02:00
Frédéric FRANCE
674b0e38c8
add new rule 2020-05-21 15:13:31 +02:00
Frédéric FRANCE
43dcd9beb5
add new rule 2020-05-21 00:02:33 +02:00
Frédéric FRANCE
3ea613896e
Update CommandeTest.php 2020-05-20 23:04:38 +02:00
Frédéric FRANCE
86e220dd40
Update ActionCommTest.php 2020-05-20 23:00:52 +02:00
Frédéric FRANCE
358054908f
Update AccountingAccountTest.php 2020-05-20 22:59:23 +02:00
Laurent Destailleur
4d6a45d491 Major doxygen fix 2020-05-03 22:48:35 +02:00
Laurent Destailleur
31ba277da7 Fix phpcs 2020-04-26 23:18:09 +02:00
Laurent Destailleur
9679b1f04c
Merge pull request #13704 from frederic34/actioncomm_note
actioncomm note deprecated
2020-04-23 18:52:56 +02:00
Laurent Destailleur
73ddfb1c81 Use label instead of libelle 2020-04-23 18:33:25 +02:00
Laurent Destailleur
098b7828fa Removed useless test 2020-04-23 13:59:40 +02:00
Laurent Destailleur
defef24c3c Fix regression 2020-04-23 13:57:27 +02:00
Frédéric FRANCE
4220d6b253
actioncomm note deprecated 2020-04-23 00:38:42 +02:00
Laurent Destailleur
b8171cacb1 Fix phpcs 2020-02-20 14:07:25 +01:00
Laurent Destailleur
a6b0fec90b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/exports/class/export.class.php
2020-02-17 12:35:34 +01:00
Laurent Destailleur
504a67daee FIX duplicate class name into some log lines 2020-02-17 12:34:00 +01:00
Laurent Destailleur
05e08b3596 FIX Filenames must not contains non ascii char or we will get non ascii
char into the SMTP header.
FIX Do not encode subject if it is full ascii (not required)
2020-02-06 12:58:02 +01:00
Laurent Destailleur
1875b6a49b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/security2.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
2020-02-05 14:53:47 +01:00
Laurent Destailleur
1fe9783760 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/product/index.php
2020-02-05 14:38:19 +01:00
Laurent Destailleur
9100b8a548 FIX SQL request and phpunit 2020-02-05 13:41:10 +01:00
Laurent Destailleur
2f1954151f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-30 12:40:35 +01:00
Laurent Destailleur
4d06a3d10b Travis 2020-01-30 03:33:17 +01:00
Laurent Destailleur
651173678c Fix url to test 2020-01-30 02:49:59 +01:00
Laurent Destailleur
74ac6a3204 Fix phpcs 2020-01-16 02:00:52 +01:00
Laurent Destailleur
1cc94ddb44 Fix travis 2020-01-16 01:44:01 +01:00
Laurent Destailleur
8f73bce878 Add warning if zip lib missing 2020-01-16 01:11:39 +01:00
Laurent Destailleur
8728000046 Show log 2020-01-16 00:23:15 +01:00
Laurent Destailleur
e8fbf45807 Fix v12 2020-01-16 00:03:30 +01:00
Laurent Destailleur
023da33297 Export with the new lib 2020-01-15 22:57:47 +01:00
Laurent Destailleur
330cca994e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2019-12-23 15:49:00 +01:00
Laurent Destailleur
3250b13f4a FIX dol_string_nohtmltag when there is html with windows EOL "<br>\r\n" 2019-12-23 15:45:08 +01:00
Laurent Destailleur
1aef1c60dd
Merge pull request #11867 from frederic34/socialnetworks
NEW add socialnetworks dictionary
2019-11-04 21:10:22 +01:00
Frédéric FRANCE
fecc9e86a5
wip 2019-11-03 19:55:56 +01:00
Frédéric FRANCE
b8202f6ed4
wip 2019-11-03 18:15:24 +01:00
Frédéric FRANCE
2da87bcdc7
Update UserTest.php 2019-11-03 17:52:58 +01:00
Frédéric FRANCE
a43e6f96b5
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-25 08:12:54 +02:00
Frédéric FRANCE
86f22c4563
do not ignore lines with mix od tabs and spaces 2019-10-20 17:17:22 +02:00
Frédéric FRANCE
9ec7836387
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-20 16:37:18 +02:00
Frédéric FRANCE
7581275316
wip 2019-10-20 11:59:21 +02:00
Frédéric FRANCE
f4540dddb8
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-17 20:24:04 +02:00
Laurent Destailleur
b9ec45fd49 Clean code 2019-10-16 14:02:13 +02:00
Frédéric FRANCE
d9ba09bec1
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-12 19:02:24 +02:00
Laurent Destailleur
5446a7bd8e Try phpunit fix 2019-10-11 17:43:15 +02:00
Frédéric FRANCE
367ef4acaf
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-11 16:44:25 +02:00
Laurent Destailleur
b5a2d37315 Fix phpunit of BOM 2019-10-11 16:10:09 +02:00
Frédéric FRANCE
02b706f9c0
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-09 13:40:46 +02:00
Laurent Destailleur
b93213e9a3 Add more phpunit 2019-10-09 13:25:32 +02:00
Laurent Destailleur
7f1aa818d2 Fix php7.4 error 2019-10-09 11:57:49 +02:00
Frédéric FRANCE
37bb548d21
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-02 20:56:32 +02:00
Laurent Destailleur
6ec36ab04e Fix phpunit 2019-10-02 20:36:57 +02:00
Frédéric FRANCE
aca9d92db8
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-01 22:03:33 +02:00
Laurent Destailleur
b79831ec39
Merge pull request #11952 from aspangaro/11.0_https
Move Gnu.org to https
2019-10-01 14:48:21 +02:00
Frédéric FRANCE
3b9bf2b06a
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-01 12:25:34 +02:00
Laurent Destailleur
8b778a8154 More log 2019-10-01 11:05:27 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Frédéric FRANCE
b87610adcc
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-30 19:34:35 +02:00
Frédéric FRANCE
506b1e8ecc
typo 2019-09-30 18:17:29 +02:00