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