Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
77,916 Commits 36 Branches 189 Tags
c72e7e6a973bcb58ffb51a22944b68f371769bc0
Commit Graph

959 Commits

Author SHA1 Message Date
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