Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
142,956 Commits 35 Branches 179 Tags 1.7 GiB
develop
Commit Graph

1807 Commits

Author SHA1 Message Date
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
Laurent Destailleur
fc9760f730 Add test for MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY and 
MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY
 2021-06-25 14:04:44 +02:00
Laurent Destailleur
46ae7180f8 Fix phpunit. Refused @@ char in sql. 2021-06-25 10:47:31 +02:00
Laurent Destailleur
f24d8a31af Fix migration 2021-06-23 11:14:28 +02:00
Laurent Destailleur
0807650311 Fix phpunit dependency 2021-06-23 01:12:48 +02:00
Laurent Destailleur
28d416a00d Try fix of phpunit 2021-06-23 00:58:27 +02:00
Laurent Destailleur
12748640a5 Add log 2021-06-22 18:04:06 +02:00
Laurent Destailleur
ecd028d124 Clean code 2021-06-22 17:33:43 +02:00
Laurent Destailleur
664e64a2ba Fix phpuni 2021-06-22 17:22:50 +02:00
Laurent Destailleur
618184f94a Fix bad name of test 2021-06-22 16:02:38 +02:00
Laurent Destailleur
42c24de2ae Fix bad test 2021-06-22 15:53:14 +02:00
Laurent Destailleur
6b93f58de6 Fix bad test 2021-06-22 15:46:51 +02:00
Laurent Destailleur
83d30be106 Fix Add missing phpunits 2021-06-22 14:40:48 +02:00
Laurent Destailleur
a0b594fbdc Debug emailcollector 2021-06-21 19:47:43 +02:00
Laurent Destailleur
d4fc23678a Add phpunit test for dolSqlDateFilter() 2021-06-20 17:12:18 +02:00
Laurent Destailleur
a556caf777 Clean phpunit file 2021-06-16 14:00:50 +02:00
Marc de Lima Lucio
1e7df0ba9f NEW: holiday: handle monthly updates with cronjob 2021-06-10 21:53:06 +02:00
Laurent Destailleur
f1c94ac659 NEW Reduce scope of dol_eval function. 2021-06-09 17:44:42 +02:00
Laurent Destailleur
c375668ab6 Clean code 2021-06-09 12:41:53 +02:00
Laurent Destailleur
ded385f12e FIX #17650 #17710 2021-05-26 11:24:29 +02:00
Laurent Destailleur
2130be975e Fix perm 2021-05-26 11:01:54 +02:00
Laurent Destailleur
fbe491c4da FIX CWE-79 huntr 2021-05-21 12:17:56 +02:00
Laurent Destailleur
ba0e95a4ff FIX huntr CWE-79 2021-05-17 23:47:16 +02:00
Laurent Destailleur
3ea6cd1c66 Fix missing columns 2021-05-12 08:53:29 +02:00
Laurent Destailleur
4da5aeedf4 Fix bad test 2021-05-12 08:42:33 +02:00
Laurent Destailleur
f5e1cd5fcc Fix phpunit 2021-05-07 18:22:18 +02:00
lmarcouiller
671633fe86 Fix : Bug included in develop branch and 13.0 2021-05-07 11:48:14 +02:00
Laurent Destailleur
c84fc06e51 Fix phpunit 2021-05-04 15:53:15 +02:00
Laurent Destailleur
5ca70b29b2 Fix phpunit 2021-05-04 15:52:38 +02:00
Laurent Destailleur
f6305bf551 FIX Sql error 2021-05-04 15:46:38 +02:00
Laurent Destailleur
526235d020 Fix substitution of mix html/nohtml 
Fix send email reminder for past due date of invoices
More PHPUnit test
 2021-05-04 13:33:18 +02:00
Laurent Destailleur
28b1d83ae9 Make some performance enhancements 2021-05-03 18:29:21 +02:00
Laurent Destailleur
7b706d6fe5 Fix phpunit for crop of image 2021-05-03 15:56:56 +02:00
Laurent Destailleur
ec544cb20e
Merge pull request #17451 from daraelmin/daraelmin-new-amntbyadhtype 
NEW #17292 default subscription amount by adherent type
 2021-05-03 15:32:39 +02:00
Laurent Destailleur
be8b866b39 Add test to detect bad value for DIRECTION in lang file 2021-05-03 15:24:19 +02:00
daraelmin
f25997b292
phpunit 2021-05-01 21:42:13 +02:00
lmarcouiller
6da32015f4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop#4 2021-04-29 09:45:30 +02:00
Laurent Destailleur
18e911a636 FIX dol_print_date for %a and %b with some Timezone 2021-04-28 20:44:22 +02:00
lmarcouiller
97043ca665 New module KnowledgeManagement 2021-04-28 14:57:49 +02:00
Laurent Destailleur
2578eb276c Fix phpunit 2021-04-19 20:25:22 +02:00
Laurent Destailleur
61df76dd9a Fix pb in date format %a %b when using a negative timezone 
Enhance date management and unit tests.
 2021-04-19 12:48:08 +02:00
Laurent Destailleur
7ff74768eb Fix pb with renaming field total 2021-04-06 20:16:14 +02:00
Alexandre SPANGARO
36e4f5aa22 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-04-06 10:29:44 +02:00
Laurent Destailleur
1b62ab73d7 Test 2021-04-04 15:42:37 +02:00
Alexandre SPANGARO
f64d0377c5 Merge remote-tracking branch 'upstream/develop' into 14a22 2021-04-04 06:03:41 +02:00
Laurent Destailleur
1a70aebba6 NEW Can set a target image in dolcropresize function. 2021-04-04 01:12:25 +02:00
Laurent Destailleur
94d1487fde Fix method name 2021-04-01 12:29:56 +02:00
Laurent Destailleur
06e92bb262 Fix compatibility php5.6+ 2021-03-30 22:03:14 +02:00
Laurent Destailleur
38f1710b43
Merge pull request #17020 from Hystepik/develop#1 
Close #4951 : New module Inventory
 2021-03-30 20:43:52 +02:00
lmarcouiller
bf42a2ad87 Close #4951 : Add TestUnit 2021-03-30 14:38:53 +02:00
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
Frédéric FRANCE
1b151da776
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-29 11:28:54 +02:00
Laurent Destailleur
6966651d51 Standardize code to use dolSqlDateFilter 2019-09-28 13:22:05 +02:00
Frédéric FRANCE
03086026b8
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-27 08:06:13 +02:00
Laurent Destailleur
961f2b5165 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/viewcat.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/takepos/invoice.php
 2019-09-24 14:25:02 +02:00
Laurent Destailleur
c53be23122 FIX Filtering the HTTP Header "Accept-Language". 2019-09-24 13:54:52 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Frédéric FRANCE
ccaa4cc1f3
work on contact 2019-09-14 16:35:18 +02:00
Frédéric FRANCE
af63ac4051
work on contact 2019-09-14 13:31:26 +02:00
Laurent Destailleur
73c3fa40bf Update phpunit 2019-09-09 10:53:13 +02:00
Laurent Destailleur
74203a6896 Fix phpcs 2019-09-06 16:01:54 +02:00
Laurent Destailleur
bb81f66a1a Add phpunit test for Lessc 2019-09-06 10:36:49 +02:00
Laurent Destailleur
9666200d6b Enhance error management 2019-09-04 19:55:15 +02:00
Laurent Destailleur
658c10a305 Fix phpunit 2019-09-02 03:40:22 +02:00
Laurent Destailleur
4e5e5542ff Fix can run ws test several times 2019-08-31 14:27:02 +02:00
Laurent Destailleur
8938573f68 Fix phpunit for last versions of phpunit 2019-08-31 00:47:12 +02:00
Laurent Destailleur
bbda4269b2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-27 17:55:21 +02:00
Laurent Destailleur
529c2f4992 Fix phpcs 2019-08-27 17:54:51 +02:00
Laurent Destailleur
31e99414b5 Prepare for php 8 2019-08-27 12:34:46 +02:00
Laurent Destailleur
69688a22e0 Merge 2019-08-27 12:33:42 +02:00
Laurent Destailleur
36c936357c Add phpunit testDolStringIsGoodIso 2019-08-27 12:25:24 +02:00
Laurent Destailleur
48d6583f1d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-27 03:42:52 +02:00
Laurent Destailleur
505a06ca3e Fix phpunit 2019-08-27 03:42:34 +02:00
Laurent Destailleur
669301669d Add phpunit for FormTest 2019-08-26 22:48:45 +02:00
Laurent Destailleur
4b5d9e44b2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-26 22:47:33 +02:00
Laurent Destailleur
45ff873064 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/paiement.php
	htdocs/core/class/html.form.class.php
 2019-08-26 22:44:49 +02:00
Laurent Destailleur
76bd9a09a6 FIX #11570 2019-08-26 22:34:41 +02:00
Laurent Destailleur
3d8f6dca76 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-01 16:30:32 +02:00
Laurent Destailleur
5a719769bc Fix phpcs 2019-08-01 16:29:18 +02:00
Laurent Destailleur
a7390e7e47
Merge pull request #11396 from ATM-Consulting/New_retained_warranty_develop 
NEW Management of retained warranty on situation invoices
 2019-07-30 21:53:09 +02:00
Laurent Destailleur
34f78c555d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-30 20:55:35 +02:00
Laurent Destailleur
0ab16b739a Add more log and phpunit 2019-07-30 20:37:07 +02:00
Laurent Destailleur
3af4ad7fc3 Compatibility with phpunit v6 2019-07-05 21:28:27 +02:00
Laurent Destailleur
ac9282667d Try new phpunit syntax 2019-07-05 21:09:21 +02:00
Laurent Destailleur
fb69f23bba Fix phpunit 2019-07-04 12:10:29 +02:00
Laurent Destailleur
b065cbc6f8 FIX #11446 2019-07-04 12:09:04 +02:00
John Botella
92f6cef00f Fix unit test 2019-07-02 12:07:22 +02:00
Laurent Destailleur
51a1550dbb Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
 2019-06-25 23:14:49 +02:00
Laurent Destailleur
441b279fd8 Add log to help track travis error 2019-06-25 18:03:12 +02:00
Laurent Destailleur
b0c76f48e1 error management 2019-06-21 09:38:26 +02:00
Laurent Destailleur
495604fa83 Fix phpunit 2019-06-20 18:16:49 +02:00
Laurent Destailleur
4295d707d0 More complete test 2019-05-28 22:21:00 +02:00
Laurent Destailleur
454316a5fa Fix getDomainFromURL 2019-05-28 22:18:22 +02:00
Laurent Destailleur
e4f3f4b547 Fix test phpunit 2019-04-11 18:06:27 +02:00
Laurent Destailleur
6e161a96c7 Enhance phpunit 2019-04-01 18:16:50 +02:00
Laurent Destailleur
23252ed646 Add a test to avoid SQL non compatible with postgresql 2019-03-18 11:10:37 +01:00
Laurent Destailleur
3716834b0a Fix bad var name 2019-03-09 01:13:15 +01:00
Laurent Destailleur
f0c2b3a151 Bette error message 2019-03-08 20:07:22 +01:00
Laurent Destailleur
b766031abf Try to fix error on pgsql 2019-03-08 20:06:09 +01:00
Frédéric FRANCE
906e1b8425
Merge remote-tracking branch 'upstream/develop' into patch-2 2019-03-05 18:21:46 +01:00
Laurent Destailleur
4aa93181d3 Fix phpunit 2019-03-05 18:17:26 +01:00
Frédéric FRANCE
0c2a77cb53
Merge remote-tracking branch 'upstream/develop' into patch-2 2019-03-05 18:14:15 +01:00
Laurent Destailleur
756b9ca07f Fix phpunit 2019-03-05 16:51:16 +01:00
Frédéric FRANCE
2f3c3aeb05
test 2019-03-04 21:24:48 +01:00
Frédéric FRANCE
16c73af0cb
remove test ticketlog 2019-03-04 20:16:18 +01:00
Laurent Destailleur
1d6028dfb0 FIX PHPUnit 2019-03-04 19:38:52 +01:00
Laurent Destailleur
a5711a51ab Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/lib/json.lib.php
	test/phpunit/JsonLibTest.php
 2019-03-02 18:30:17 +01:00
Frédéric FRANCE
40d34940f1
fix exclude from phpcs 2019-03-02 10:00:51 +01:00
Frédéric FRANCE
be8db31388
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-03-01 19:24:27 +01:00
Laurent Destailleur
1cb3bad7f8 Rename file 2019-03-01 19:01:47 +01:00
Frédéric FRANCE
81f2f99db5
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-26 21:16:01 +01:00
Laurent Destailleur
9e82c37963 WIP Start module BOM 2019-02-26 19:27:04 +01:00
Frédéric FRANCE
42a1387218
wip 2019-02-25 00:56:48 +01:00
klemens
beb2791dde spelling fixes 2019-02-10 12:59:09 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
24b073771e
wip 2019-01-27 13:07:22 +01:00
Laurent Destailleur
0f61a99cc6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-21 05:51:35 +01:00
Laurent Destailleur
270033469f Log 2019-01-21 03:50:05 +01:00
Laurent Destailleur
3ddfcbe3bb Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	dev/setup/codesniffer/ruleset.xml
 2019-01-20 20:36:45 +01:00
Laurent Destailleur
9ffd859830 Fix phpunit 2019-01-20 18:14:51 +01:00
Laurent Destailleur
654b025915 Fix bad name 2019-01-20 15:27:20 +01:00
Laurent Destailleur
2e3f247544 Fix name of module 2019-01-20 15:02:32 +01:00
Laurent Destailleur
6156d04195 Fix init of module list 2019-01-20 14:41:35 +01:00
Laurent Destailleur
ec0c6985e7 Try to fix error when module not enabled 2019-01-20 13:57:00 +01:00
Laurent Destailleur
51b03e358e Fix phpunit 2019-01-20 13:45:29 +01:00
Laurent Destailleur
e6f47717b5 Fix phpunit 2018-12-22 19:48:14 +01:00
Laurent Destailleur
415fbc19af Fix param 2018-12-22 18:12:29 +01:00
Laurent Destailleur
8a70cf9ede NEW Add parameter replaceambiguouschars on getRandomPassword function 2018-12-21 09:56:54 +01:00
Alexandre SPANGARO
60f56fcf8d
Merge branch 'develop' into 10.0_members 2018-12-14 11:39:02 +01:00
Maxime Kohlhaas
2e496ea83a QUAL rename facnumber by ref 2018-12-02 17:33:44 +01:00
Laurent Destailleur
5e9abe6aad Fix getLanguageCodeFromCountryCode 2018-11-21 16:28:36 +01:00
Alexandre SPANGARO
52efbfaba8 Update travis test 2018-11-20 06:53:49 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Frédéric FRANCE
f9a3dec26d
Update FactureTest.php 2018-10-20 23:07:08 +02:00
Laurent Destailleur
2c1e8d6535 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/expedition/class/expeditionbatch.class.php
	htdocs/public/payment/newpayment.php
	htdocs/stripe/config.php
 2018-10-16 18:47:11 +02:00
Laurent Destailleur
88ff7241f5 FIX Quick hack to solve pb of bad definition of public holidays 2018-10-11 13:12:36 +02:00
Laurent Destailleur
111d589474 NEW Can mix offset before and after with rules for due date of invoices 2018-10-04 16:06:26 +02:00
Laurent Destailleur
51e4ba11d3 Move phpunit 2018-09-28 18:09:50 +02:00
Laurent Destailleur
73458f649f Fix phpcs 2018-09-28 18:09:07 +02:00
Laurent Destailleur
603db250f0 Clean takepos 2018-09-28 13:36:46 +02:00
Laurent Destailleur
0073d63464 Fix phpcs 2018-09-21 09:42:33 +02:00
Laurent Destailleur
5bd538fb2c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/modules/modStripe.class.php
	htdocs/filefunc.inc.php
	htdocs/projet/element.php
 2018-09-20 23:43:34 +02:00
Laurent Destailleur
37dcb33661 phpunit for Loan 2018-09-20 23:41:04 +02:00
Laurent Destailleur
c55ebecff7 Include PHP unit of Loan class into Travis 2018-09-20 19:06:12 +02:00
Maxime Kohlhaas
75104999d3 NEW PHPUnitTest on Loan class #3163 2018-09-20 15:04:00 +02:00
Laurent Destailleur
76cdbc8bf1
Merge branch 'develop' into testsqlAndScript 2018-09-15 17:01:23 +02:00
Frédéric FRANCE
b05c175a78
Merge remote-tracking branch 'upstream/develop' into testsqlAndScript 2018-09-02 19:00:43 +02:00
Frédéric FRANCE
e13a8ec572
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-02 18:19:45 +02:00
Laurent Destailleur
3d3edb19d8 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	htdocs/langs/en_US/commercial.lang
 2018-09-02 15:48:26 +02:00
Laurent Destailleur
76d6affb27 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	.travis.yml
 2018-09-02 15:46:09 +02:00
Laurent Destailleur
ebba0b9e67 phpunit 6.1 compatibility 2018-09-02 15:24:29 +02:00
Laurent Destailleur
a7dfc88b59 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	test/phpunit/CoreTest.php
 2018-09-02 15:21:21 +02:00
Laurent Destailleur
bd3647a9d7 Prepare phpunit 6.1 compatibility 2018-09-02 14:23:52 +02:00
Laurent Destailleur
02bedc49d3 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	test/phpunit/PricesTest.php
	test/phpunit/RestAPIUserTest.php
	test/phpunit/WebservicesInvoicesTest.php
 2018-09-02 14:15:17 +02:00
Laurent Destailleur
a69c3caf2c Prepare compatibility with phpunit 6.1 2018-09-02 14:10:06 +02:00
Laurent Destailleur
53caac13a9 Test phpunit 2018-09-02 13:57:51 +02:00
Frédéric FRANCE
3e723af018
start changing phpcs:ignore 2018-09-01 23:46:13 +02:00
Frédéric FRANCE
ab9bf78ecf
replace test_sql_and_script_inject 2018-09-01 17:42:16 +02:00
Frédéric FRANCE
10200374ef
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 14:06:23 +02:00
Frédéric FRANCE
57fb3dc2f4
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 13:52:51 +02:00
Laurent Destailleur
5604f3b0c3
Merge pull request #9376 from frederic34/functionCommentMissing 
function Comment Missing
 2018-09-01 12:59:32 +02:00
Frédéric FRANCE
02b74afe5f
function Comment Missing 2018-08-31 22:41:51 +02:00
Frédéric FRANCE
b015d05f07
function Comment Missing 2018-08-31 22:25:11 +02:00
Frédéric FRANCE
b513cf57d0
function Comment Missing 2018-08-31 21:44:54 +02:00
Frédéric FRANCE
6aee680a4f
PSR2 ClassDeclaration 2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace 2018-08-29 21:25:22 +02:00
Frédéric FRANCE
fe4260a014
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-28 09:34:53 +02:00
Frédéric FRANCE
6b6daf178f
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-21 20:57:58 +02:00
Frédéric FRANCE
aba69b94b2
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-21 14:03:02 +02:00
Frédéric FRANCE
39462742e2
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-16 08:17:55 +02:00
Laurent Destailleur
b515511ad6
Merge branch 'develop' into FunctionDeclaration 2018-08-16 00:52:55 +02:00
Laurent Destailleur
5c712a6cd3
Merge branch 'develop' into trimtrailing 2018-08-16 00:47:09 +02:00
Frédéric FRANCE
54a078149a
function declaration 2018-08-15 17:34:35 +02:00
Frédéric FRANCE
7bb781eea8
function declaration 2018-08-15 14:28:34 +02:00
Frédéric FRANCE
5146ab9177
trim 2018-08-14 15:34:44 +02:00
Frédéric FRANCE
a0a6afc224
return comment 2018-08-14 12:23:10 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function 2018-08-13 17:26:32 +02:00
Frédéric FRANCE
1b27cca91c
Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-13 08:53:07 +02:00
Laurent Destailleur
6a8ed56c3d Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-13 01:23:43 +02:00
Laurent Destailleur
31c42c9a32 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/societe/canvas/actions_card_common.class.php
 2018-08-13 01:23:03 +02:00
Laurent Destailleur
7cd24c389d Fix firstname/lastname 2018-08-13 01:21:23 +02:00
Frédéric FRANCE
b90d125fda
trim trailing 2018-07-26 20:19:52 +02:00
Frédéric FRANCE
6cb0fb10d6
trim trailing 2018-07-26 19:05:34 +02:00
Frédéric FRANCE
a0a5d33641
test include 2018-07-26 17:30:53 +02:00
Laurent Destailleur
91b7ee5fc2 NEW Add function isValidMXRecord 2018-07-04 11:07:28 +02:00
Laurent Destailleur
fec9a96ad1 Fix travis 2018-07-02 09:34:34 +02:00
Laurent Destailleur
7e7d419e2d Test travis 2018-07-02 08:43:08 +02:00
Laurent Destailleur
93184c5f66 Fix travis 2018-07-01 23:57:54 +02:00
Frédéric FRANCE
ee72823c82
Update ActionCommTest.php 2018-06-10 10:32:28 +02:00
Frédéric FRANCE
dd759dc92f
Update AllTests.php 2018-06-10 10:16:22 +02:00
Laurent Destailleur
202d37bc24 Add PHPunit tests for action comm 2018-06-07 13:07:15 +02:00
Laurent Destailleur
28e24de1e9 Fix Ticketsup name 2018-06-06 12:06:16 +02:00
Laurent Destailleur
87d073b5cd Fix conflict with external ticketsup module 2018-06-04 21:49:29 +02:00
Frédéric FRANCE
e2a557aadd
limit length of lines to 500 chars 2018-05-27 15:04:12 +02:00
Raphaël Doursenaud
be78c37985
Fix typo 2018-05-23 11:37:12 +02:00
Laurent Destailleur
3c4c48c331 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-05-21 23:43:58 +02:00
Laurent Destailleur
7fce02e72e Fix phpunit test name 2018-05-21 23:43:26 +02:00
Laurent Destailleur
de84f0e687 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/actions_massactions.inc.php
	htdocs/filefunc.inc.php
 2018-05-21 23:35:09 +02:00
Laurent Destailleur
79bbeb05ae Add missing phpunit tests 2018-05-18 11:17:33 +02:00
Laurent Destailleur
80bce6b62d Add phpunit for accountingaccount 2018-05-18 09:25:59 +02:00
Laurent Destailleur
59e5545aa7 Fix phpunit 2018-04-27 09:18:25 +02:00
Laurent Destailleur
e9a2894727 Fix PSR2 2018-04-22 20:59:29 +02:00
Laurent Destailleur
b049cf194d Fix PSR2 2018-04-22 20:17:27 +02:00
Laurent Destailleur
0f16ccbc4a Enhance dol_encode/dol_decode function 2018-04-19 12:03:42 +02:00
Laurent Destailleur
2959dc4a3a Fix regression 2018-04-15 18:20:04 +02:00
Laurent Destailleur
7811796491 Fix test 2018-04-13 15:43:26 +02:00
Laurent Destailleur
ea2fd67e0d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/card.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/langs/de_DE/admin.lang
 2018-04-12 13:31:14 +02:00
Laurent Destailleur
8aa41c09c0 Fix phpunit 2018-04-11 19:31:28 +02:00
Laurent Destailleur
956fc2376d FIX #8483 2018-04-06 12:27:55 +02:00
Laurent Destailleur
5d6d019fe7 Fix phpunit 2018-04-06 00:21:40 +02:00
Laurent Destailleur
48ff89c63b Fix regression 2018-04-05 19:52:54 +02:00
Laurent Destailleur
b210360220 More test 2018-04-05 12:59:01 +02:00
Laurent Destailleur
04ca623ced More tests 2018-03-25 13:12:14 +02:00
Laurent Destailleur
01f25b00b0 Test 2018-03-12 23:43:47 +01:00
Laurent Destailleur
612d36a2f8 Fix phpunit 2018-03-12 19:32:57 +01:00
Laurent Destailleur
bf36d671ba Fix ticket deletion 2018-03-12 19:30:21 +01:00
Laurent Destailleur
1603837933 Report error in phpunit 2018-03-12 15:03:03 +01:00
Laurent Destailleur
a190732135 Add ticketsup in module to init 2018-03-12 15:01:59 +01:00
Laurent Destailleur
735156f4b8 Try to fix phpunit error 2018-03-12 13:22:09 +01:00
Laurent Destailleur
97c93e35fc Add phpunit for ticket 2018-03-12 12:57:39 +01:00
Laurent Destailleur
b5ca4ca391 PHPunit 2018-03-11 23:19:43 +01:00
jfefe
79acb79ae0 Begin integration of module « Ticketsup » 
Related to #4948
 2018-03-11 09:44:58 +01:00
BENKE Charlene
0d50cab97e
primary key without space 2018-03-10 23:05:24 +01:00
Laurent Destailleur
3ad95e46c0 Fix phpunit 2018-03-08 22:40:42 +01:00
Laurent Destailleur
7ba55ea12e Fix phpunit 2018-02-14 22:17:53 +01:00
Laurent Destailleur
dcd579242f Fix <br /> (xml) into <br> (html) 2018-01-17 13:26:57 +01:00
Laurent Destailleur
e1f0483b23 Fix grabber of url when url is on second level dir. More phpunits 2017-12-10 17:59:19 +01:00
Laurent Destailleur
ccd4f74f51 Fix PHPunit 2017-12-05 19:24:26 +01:00
Laurent Destailleur
0a73daba01 Security: on target=_blank, we must have rel="noopener" 2017-12-02 03:04:52 +01:00
Laurent Destailleur
ce32da6217 Fix debugs APIs 2017-12-01 15:39:18 +01:00
Laurent Destailleur
0b470bef80 Add phpunit for make_substitutions 2017-11-26 10:24:33 +01:00
Laurent Destailleur
2caeafc03b NEW Compatibility with PHP 7.2 2017-11-17 18:32:37 +01:00
Laurent Destailleur
0b349bef60 Test php 7.2 2017-11-17 17:15:23 +01:00
Laurent Destailleur
e7121cda81 Disable some test with php 7.2 2017-11-17 17:11:35 +01:00
Laurent Destailleur
0be11e5e45 Fix phpunit 2017-11-17 16:06:55 +01:00
Laurent Destailleur
ea42fe28d2 Test ok on travis 2017-11-06 20:39:24 +01:00
Laurent Destailleur
d90e3e88c2 NEW Add method executeCLI and a phpunit 2017-11-06 20:24:12 +01:00
Laurent Destailleur
91950ccbc7 Fix regression in getRandomPassword 2017-11-05 03:03:17 +01:00
Laurent Destailleur
d47ab77123 Check module is on 2017-10-24 10:02:33 +02:00
Laurent Destailleur
53d2f29cdd Fix regression 2017-10-23 10:27:50 +02:00
Laurent Destailleur
097d5fd623 Fix phpunit 2017-10-22 13:12:06 +02:00
Laurent Destailleur
4247038d01 Add phpunit test 2017-10-22 13:06:27 +02:00
Laurent Destailleur
cb4d863e83 Fix phpunit 2017-10-22 04:34:28 +02:00
Laurent Destailleur
8e4cb2ea79 Update doc/test 2017-10-18 12:09:11 +02:00
Laurent Destailleur
436ec93084 FIX is_erasable report bad value when thirdparty was not loaded 2017-10-04 03:22:41 +02:00
Laurent Destailleur
f380747e20 More accurate error code 2017-10-04 01:11:19 +02:00
Laurent Destailleur
8794e54eba Try to fix phpunit 2017-10-03 22:52:57 +02:00
Laurent Destailleur
fa6c3eff80 More PHPunit on invoice deletion 2017-09-30 12:53:24 +02:00
Regis Houssin
92ff974c5b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap 2017-09-25 06:47:34 +02:00
Laurent Destailleur
7a6180858e Fix phpunit 2017-09-24 21:12:50 +02:00
Regis Houssin
1f88e624c2 Fix: add ldap import/export script 2017-09-17 10:42:00 +02:00
Laurent Destailleur
5e34b121dd Add more robust php unit to detect not escaped sql. Fix not escaped sql 2017-09-15 15:41:07 +02:00
Laurent Destailleur
9523bf5fbd Remove useless code 2017-09-14 10:23:17 +02:00
Laurent Destailleur
205989b64b Fix phpunit 2017-09-14 09:16:57 +02:00
Laurent Destailleur
b3b00f63e4 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-13 22:30:43 +02:00
Laurent Destailleur
4b8862c1ec Remove useless import 2017-09-13 21:54:16 +02:00
Laurent Destailleur
fed3165b53 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/core/lib/price.lib.php
 2017-09-13 21:53:03 +02:00
Laurent Destailleur
6d40f797d2 Fix regression 2017-09-13 21:50:14 +02:00
Laurent Destailleur
eadfbfe2bd Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/lib/functions2.lib.php
 2017-09-13 20:57:53 +02:00
Laurent Destailleur
f2cd96b9c0 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	ChangeLog
	htdocs/adherents/class/adherent.class.php
	htdocs/core/lib/price.lib.php
	htdocs/filefunc.inc.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/supplier_proposal/list.php
 2017-09-13 20:55:22 +02:00
Laurent Destailleur
dc38ec5051 Fix regression 2017-09-13 20:48:24 +02:00
Laurent Destailleur
a9e44a2cf5 NEW Enhance the anti XSS filter 2017-09-07 13:54:49 +02:00
Laurent Destailleur
e25a428118 Fix compatibility with Internet Explorer 2017-08-23 12:32:28 +02:00
Laurent Destailleur
5b1f5b0f20 Fix translation done twice into field title of array 2017-08-02 13:31:53 +02:00
Laurent Destailleur
bdfb0b7561 FIX pgsql compatibility. Add PHPUnit to avoid using dates without quotes 2017-07-26 21:22:53 +02:00
Laurent Destailleur
25b107defb Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/contrat/list.php
	htdocs/fichinter/list.php
 2017-07-23 19:09:00 +02:00
Laurent Destailleur
44023606c6 Fix pb in dolGetFirstLineOfText. Add PHPunit 2017-07-22 12:47:35 +02:00
Laurent Destailleur
23fbef3dae Fix the delete dir functions does not return real nb of deleted files. 2017-07-13 00:26:05 +02:00
Laurent Destailleur
a92effa622 Fix clean test 2017-07-09 21:16:09 +02:00
Laurent Destailleur
a562e5a919 Maxi debug of accountancy ledger page. 2017-07-08 20:52:53 +02:00
Laurent Destailleur
252d8da8fc Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/core/class/commondocgenerator.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/filefunc.inc.php
	htdocs/societe/class/societe.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2017-07-07 15:11:53 +02:00
Laurent Destailleur
b308cfef1d Fix dol_trunc 2017-06-30 18:30:01 +02:00
Laurent Destailleur
1fafa4017d Fix test on currency name 2017-06-27 12:33:29 +02:00
Laurent Destailleur
32ff09123d Add more info on phpunit 2017-06-27 12:19:48 +02:00
Laurent Destailleur
2f4749a7a2 Revert "Add php unit" 
This reverts commit cb93770d6b.
 2017-06-27 12:02:22 +02:00
Laurent Destailleur
cb93770d6b Add php unit 2017-06-26 13:29:43 +02:00
Laurent Destailleur
2be848025f Fix parameter withcode of currency_name function. Add PHPUnit tests 2017-06-26 10:09:22 +02:00
Laurent Destailleur
f1701469e0 NEW data files are now also parsed by phpunit for sql syntax 2017-06-20 13:28:34 +02:00
Laurent Destailleur
095155a58b Enhance sql quality. Refused double quotes into sql content. 2017-06-20 10:06:17 +02:00
Laurent Destailleur
eef5df583e Fix php 7.2 2017-06-20 00:50:30 +02:00
Laurent Destailleur
8064659398 Fix phpunit 2017-06-19 20:49:57 +02:00
Laurent Destailleur
819656bd89 Fix security: Check _SERVER["QUERY_STRING"] is escaped. 2017-06-18 21:27:49 +02:00
Laurent Destailleur
86a6a83647 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/admin/tools/index.php
	htdocs/bookmarks/bookmarks.lib.php
	htdocs/compta/facture.php
	htdocs/core/tpl/passwordforgotten.tpl.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/main.inc.php
	htdocs/product/stats/card.php
	htdocs/public/paypal/paymentko.php
 2017-06-18 21:13:48 +02:00
Laurent Destailleur
605dbd61f2 Fix phpunit 2017-06-10 00:21:04 +02:00
Laurent Destailleur
7f18dfee0d Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	dev/skeletons/build_class_from_table.php
	dev/skeletons/skeleton_card.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/filefunc.inc.php
	htdocs/projet/card.php
 2017-06-03 01:55:05 +02:00
Laurent Destailleur
9b4c929d79 NEW Add phpunit to check the engine is defined into sql create files. 2017-06-01 16:09:09 +02:00
Laurent Destailleur
f4cdb6b254 Fix month on 2 chars. Some setup return on 1 char only. More phpunit 
assert.
 2017-06-01 15:33:23 +02:00
Laurent Destailleur
145cb628cd FIX dol_string_nohtmltag make 2 passes to clean html into html 
attributes.
 2017-05-31 11:11:25 +02:00
Laurent Destailleur
c26e072694 Code comment 2017-05-29 13:29:27 +02:00
Laurent Destailleur
dd5976066a Fix travis 2017-05-22 02:04:43 +02:00
Laurent Destailleur
a3eef35ce6 Fix travis error 2017-05-22 01:19:16 +02:00
Laurent Destailleur
ef9cf6ef52 Add test on phpunit 2017-05-21 23:54:37 +02:00
Laurent Destailleur
246fa9748b Debug travis error 2017-05-21 23:06:45 +02:00
Laurent Destailleur
6052d2d8ed Try to output log after error 2017-05-21 21:37:33 +02:00
Laurent Destailleur
e85f31f456 Fix phpunit 2017-05-21 21:33:24 +02:00
Laurent Destailleur
4a085a8cc0 Fix phpunit 2017-05-21 21:21:44 +02:00
Laurent Destailleur
3e381aa5a2 Fix phpunit 2017-05-21 21:04:20 +02:00
Laurent Destailleur
ff35229be5 Fix phpunit 2017-05-21 20:46:11 +02:00
Laurent Destailleur
6e31de731b Fix phpunit 2017-05-21 20:24:56 +02:00
Laurent Destailleur
52b5a8ece7 More powerfull dol_move function. 2017-05-21 14:06:43 +02:00
Laurent Destailleur
7e25cc0475 FIX Phpunit on file submit with REST API 2017-05-20 17:09:15 +02:00
Laurent Destailleur
80cbc28385 NEW Add REST API to push a file. 2017-05-20 15:52:36 +02:00
Laurent Destailleur
864dc0d989 Remove var_dump 2017-05-20 11:59:32 +02:00
Laurent Destailleur
1fe17a6918 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-05-20 11:34:21 +02:00
Laurent Destailleur
9355f28d6c Merge branch 'develop' into api_files 2017-05-20 11:33:46 +02:00
Laurent Destailleur
601f3ea75e Fix dol_check_secure_access_document in write mode, add phpunit tests 2017-05-20 11:31:03 +02:00
Laurent Destailleur
06b37d0e82 Work on dol_check_secure_access_document to support write question 2017-05-19 20:17:33 +02:00
Laurent Destailleur
88fc7dbc3e Fix remove warning 2017-05-18 19:24:44 +02:00
Laurent Destailleur
5729bdb2c9 Fix phpunit 2017-05-13 19:51:31 +02:00
Laurent Destailleur
f8403d5020 Fix phpunit test 2017-05-12 20:01:45 +02:00
Laurent Destailleur
fa290c34fa Fix against SQL injection. Add phpunit to detect missing escapement. 2017-05-12 16:55:11 +02:00
Laurent Destailleur
88e7d54915 Add phpunit to detect SQL not escaped string. 2017-05-12 15:45:00 +02:00
Laurent Destailleur
c4722e3694 FIX XSS 2017-05-10 11:48:45 +02:00
Laurent Destailleur
5c33c1773f FIX XSS 2017-05-10 11:47:34 +02:00
Laurent Destailleur
8c07f514c8 Add php unit tests on expense reports 2017-04-14 16:51:30 +02:00
Laurent Destailleur
aef3592698 Fix travis 2017-04-14 13:56:26 +02:00
Juanjo Menent
e4ed626912 Fix: Travis error 2017-04-09 12:50:09 +02:00
Laurent Destailleur
65be3107c3 Fix phpunit 2017-04-01 00:51:16 +02:00
Laurent Destailleur
cb0eb26faa Fix phpunit 2017-03-23 20:37:04 +01:00
Laurent Destailleur
d2b766f9f4 Fix PHP 7.1 2017-01-16 10:17:25 +01:00
Laurent Destailleur
ac80d4057d Fix several running time errors 2017-01-16 09:30:28 +01:00
Laurent Destailleur
24cad7cfdf Fix return code REST similar for all api with POST 2016-12-23 14:57:00 +01:00
Laurent Destailleur
c750ba8b99 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/install/mysql/data/llx_c_payment_term.sql
	htdocs/langs/en_US/bills.lang
	htdocs/langs/en_US/mails.lang
 2016-12-16 13:56:55 +01:00
Laurent Destailleur
d32fd7aa11 FIX javascript xss injection and a translation 2016-12-15 11:55:33 +01:00
jfefe
b8284447fd API can receive documents 2016-12-12 15:20:44 +01:00
Maxime Kohlhaas
add55e8764 new phpunit test for pu calculation from pu_devise 2016-12-11 15:23:55 +01:00
Maxime Kohlhaas
43b402f608 fix phpunit test with new multicurrency return value pu_ht_devise 2016-12-11 15:11:11 +01:00
Laurent Destailleur
4768017662 Debug of module accountancy 2016-11-16 19:23:32 +01:00
Laurent Destailleur
a658b7cc3d Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/comm/card.php
 2016-10-31 21:31:57 +01:00
Laurent Destailleur
3882fa0c3d Fix dol_buildpath with parameter 3. Add phpunit tests 2016-10-31 10:37:58 +01:00
Laurent Destailleur
b284bdd953 NEW #5896 More complete data on event sent by email (name in title, 
emails list in details)
 2016-10-24 02:02:30 +02:00
Laurent Destailleur
c3f5962058 Normalize code 2016-09-28 18:14:44 +02:00
Laurent Destailleur
4ec7bcd23e Rename api class to solve conflict 2016-09-22 11:36:16 +02:00
Laurent Destailleur
fac28f9589 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/facture.php
	htdocs/compta/sociales/charges.php
	htdocs/core/boxes/modules_boxes.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
 2016-08-28 02:40:20 +02:00
Laurent Destailleur
0d992b2b99 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 
Conflicts:
	htdocs/cron/class/cronjob.class.php
	htdocs/install/pgsql/functions/functions.sql
 2016-08-28 02:17:04 +02:00
Laurent Destailleur
bc8e203019 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2016-08-28 01:58:43 +02:00
Laurent Destailleur
5d7414dcc3 Solve php regression failing travis 2016-08-28 01:58:11 +02:00
Raphaël Doursenaud
d2dd9bdce7
New: Installation process functional test 2016-08-13 01:32:07 +02:00
Laurent Destailleur
a353093ae7 NEW Phone formatting for Canada. Add dol_print_phone into phpunit tests 2016-08-01 20:18:31 +02:00
Laurent Destailleur
8b3136cb96 Merge remote-tracking branch 'origin/4.0' into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/langs/en_US/admin.lang
	htdocs/langs/fr_FR/companies.lang
 2016-07-27 19:04:55 +02:00
Laurent Destailleur
ee0c77a305 Merge branch 'refactor-rest-api' of 
https://github.com/EuskalMoneta/dolibarr into
EuskalMoneta-refactor-rest-api

Conflicts:
	htdocs/api/admin/explorer.php
 2016-07-27 14:06:14 +02:00
Laurent Destailleur
b615b52f47 FIX html detection fails if only u tag is present 2016-07-26 16:11:38 +02:00
Laurent Destailleur
27e0859051 Fix travis error 2016-07-26 13:52:43 +02:00
Raphaël Doursenaud
2c000c20da
Prevent PHP notice on unitialized variables. 
These variables are expected to be uninitialized when the forced install
process is not used.
 2016-07-23 02:01:49 +02:00
Laurent Destailleur
e2a03d18dd Merge remote-tracking branch 'origin/4.0' into develop 2016-07-16 19:58:36 +02:00
Laurent Destailleur
d0380adc39 Merge remote-tracking branch 'origin/3.9' into 4.0 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/includes/jquery/plugins/datatables/media/js/jquery.js
	htdocs/product/list.php
 2016-07-16 19:54:57 +02:00
Laurent Destailleur
931531232c FIX duplicate jquery.js files 2016-07-16 19:38:18 +02:00
Laurent Destailleur
9a32fb2ac7 Fix phpcs 2016-07-15 14:17:18 +02:00
Laurent Destailleur
9512bf1ac7 Add phpunit tests for option USE_STRICT_CSV_RULES 2016-07-15 12:30:24 +02:00
Laurent Destailleur
abb808231f Merge pull request #5377 from EuskalMoneta/fix-failure-in-WebservicesInvoicesTest 
Improve the code in WebservicesInvoicesTest.
 2016-07-14 23:16:10 +02:00
Laurent Destailleur
d23a8a56ea Fix must use the constant, not hard coded value. 2016-06-25 21:40:45 +02:00
Laurent Destailleur
945fcc7586 FIX Better support of GROUP_CONCAT for postgresql 2016-06-25 14:38:10 +02:00
Laurent Destailleur
1c1d8887b1 Complete phpunit 2016-06-25 02:45:11 +02:00
Xebax
ea3094cad1 Improve the code in WebservicesInvoicesTest. 
The third party needed for the tests is created in setUpBeforeClass()
and not in the constructor to avoid creating several objects (the
constructor is called for each test).
 2016-06-23 17:20:22 +02:00
Xebax
4a0d554986 Revert "REST API: fix deleting a product/service." 
This reverts commit d7c8a466b1.
 2016-06-21 22:54:38 +02:00
Laurent Destailleur
73fb7b2615 Fix phpunit regression. phpunit test on ws invoice is cleaner. 2016-06-21 01:07:44 +02:00
Xebax
388839296e REST API: update the URLs in RestAPIUserTest.php. 2016-06-20 17:56:33 +02:00
Xebax
d7c8a466b1 REST API: fix deleting a product/service. 
Add a User parameter to the Product::delete() method to explicitly set
the user that performs the action instead of using a global variable.
In the calls to Product::delete() with a fetched object, remove the
deprecated parameter $id.
 2016-06-20 17:56:33 +02:00
Laurent Destailleur
b1bd6b5d6e Fix regression 2016-05-18 18:23:38 +02:00
Laurent Destailleur
236ecf01b6 Help debug travis 2016-05-18 10:57:03 +02:00
Laurent Destailleur
4e46a01d51 Fix regression introduced with option SUPPLIERORDER_WITH_NOPRICEDEFINED 2016-05-17 22:59:46 +02:00
Laurent Destailleur
a36b780c53 Fix phpunit 2016-05-17 20:30:04 +02:00
Laurent Destailleur
d1d1b824b4 Better coding of #5181. I removed need of external lib. 2016-05-13 20:20:48 +02:00
Laurent Destailleur
e9c1723f8d Fix phpunit tests 2016-03-12 11:39:21 +01:00
Laurent Destailleur
71a12824c9 Merge branch 'new_numbering_module_supplier_payment' of 
https://github.com/atm-ph/dolibarr into
atm-ph-new_numbering_module_supplier_payment

Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-02-15 00:31:33 +01:00
phf
1b552a0b3b Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_multicurrency_module 
Conflicts:
	htdocs/core/class/link.class.php
	htdocs/install/mysql/migration/3.9.0-4.0.0.sql
 2016-02-03 18:30:59 +01:00
Laurent Destailleur
6fcf2fb35a Better log 2016-02-02 17:27:34 +01:00
Laurent Destailleur
547ffd7fcc Add missing phpunit tests 2016-02-02 17:26:14 +01:00
Laurent Destailleur
43d165f985 Merge remote-tracking branch 'origin/3.8' into 3.9 2016-02-02 13:02:10 +01:00
Laurent Destailleur
015f24e80a Fix php unit to work both with old and new setup 2016-02-02 13:01:19 +01:00
Laurent Destailleur
a67f52e491 Fix php unit to work both with old and new setup 2016-02-02 13:00:30 +01:00
Laurent Destailleur
e9256913b1 Fix set INVOICE_CAN_ALWAYS_BE_REMOVED to have phpunit test ok 2016-01-31 21:32:15 +01:00
Laurent Destailleur
2d0c823ffe Fix bad transaction level due to code of situation invoices 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2016-01-31 20:45:06 +01:00
Laurent Destailleur
7b15ac1179 Fix bad transaction level due to code of situation invoices 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2016-01-31 20:44:09 +01:00
Laurent Destailleur
6002adb04c Fix bad transaction level due to code of situation invoices 2016-01-31 20:38:11 +01:00
phf
4baff7898d FIX insert FactureLigne 
FIX phpunit PriceTest with new values returned for multicurrency module
NEW add test in PriceTest
FIX FactureTest properties not defined
 2016-01-26 22:18:31 +01:00
Laurent Destailleur
bd91f327b8 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	.travis.yml
	htdocs/filefunc.inc.php
 2015-12-19 01:38:22 +01:00
Laurent Destailleur
298396a57e Merge remote-tracking branch 'origin/3.7' into 3.8 
Conflicts:
	test/phpunit/AllTests.php
 2015-12-19 01:27:19 +01:00