Commit Graph

1199 Commits

Author SHA1 Message Date
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
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
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
57bf70a921 Try upgrade tool for phpunit 2020-11-01 19:09:12 +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
SwikritiT
f7dab981c7 add user api feature file updated 2020-10-23 11:06:56 +05:45
SwikritiT
a248921d73 List user feature file using api
Co-authored-by:Yamuna Adhikari<adhikariamuna4444@gmail.com>
2020-10-23 11:06:56 +05:45
Laurent Destailleur
4662402a40
Merge pull request #15033 from jasson99/resizeBrowserSizeForTests
Specify window size for tests run
2020-10-15 20:12:20 +02:00
Laurent Destailleur
5b37ff0bfd Html entities use now HTML5. Enhance the Dolibarr WAF. More PHPUnit
tests.
2020-10-15 19:36:08 +02:00
jasson99
741700db7a admin login stepdefinition moved from addUsersContext file to loginContext file 2020-10-15 19:41:49 +05:45
jasson99
15dfcdb8e3 window-size is kept fixed for acceptance tests run 2020-10-15 19:26:10 +05:45
Laurent Destailleur
c271761212 Update doc 2020-10-15 11:36:19 +02:00
Laurent Destailleur
f33688bd0c Update doc 2020-10-15 11:01:37 +02:00
Laurent Destailleur
d21578d759 Update doc 2020-10-15 10:47:44 +02:00
Laurent Destailleur
5b091c01db Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-15 10:42:08 +02:00
Laurent Destailleur
6ad069a883 Enhance doc 2020-10-15 10:41:57 +02:00
amunaadh
baddd7741e ReadMe file edited
Co-authored-by: Swikriti Tripathi <swikriti808@gmail.com>
2020-10-15 10:20:13 +05:45
Laurent Destailleur
1e2fd359ac Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-14 18:03:19 +02:00
Laurent Destailleur
fc69b88923 Update doc 2020-10-14 18:03:02 +02:00
Laurent Destailleur
034d3d7072
Merge pull request #15014 from amunaadh/develop
[Tests-only] Added API tests for add users feature
2020-10-14 17:54:51 +02:00
Laurent Destailleur
e8ea7125e5 Removed the FIXME. The dol_getdate can now use a timezone. 2020-10-14 17:11:22 +02:00
amunaadh
5d33761b13 API test added for addUsers
Co-authored-by: Swikriti Tripathi <swikriti808@gmail.com>
2020-10-14 13:03:38 +05:45
Laurent Destailleur
f468c61df3 Fix More powerfull detection of bad use of newToken 2020-10-12 14:04:34 +02:00
Laurent Destailleur
7766676f00 Move readme position 2020-10-08 19:45:53 +02:00
SwikritiT
475893f4de READ ME added
Co-authored-by: Yamuna Adhikari <adhikariamuna4444@gmail.com>
2020-10-08 12:59:56 +05:45
SwikritiT
f343fbb55e travis setup
Co-authored-by: Yamuna Adhikari <adhikariamuna4444@gmail.com>
2020-10-08 12:59:56 +05:45
SwikritiT
1ef46d082c Feature files created to login, add users and logout
Co-authored-by: Yamuna Adhikari <adhikariamuna4444@gmail.com>
2020-10-08 12:59:56 +05:45
Laurent Destailleur
4cf6e483ca Fix export of various payments. 2020-09-28 18:49:20 +02:00
Laurent Destailleur
c268f07a80 Doc 2020-09-24 16:55:55 +02:00
Laurent Destailleur
43783008c1 Doc 2020-09-24 15:45:52 +02:00
Laurent Destailleur
48da6483e6 Add doc 2020-09-24 13:41:26 +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