Commit Graph

11 Commits

Author SHA1 Message Date
Frédéric FRANCE
42a1387218 wip 2019-02-25 00:56:48 +01:00
Frédéric FRANCE
24b073771e wip 2019-01-27 13:07:22 +01: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
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
Frédéric FRANCE
6aee680a4f PSR2 ClassDeclaration 2018-08-29 22:06:05 +02:00
Laurent Destailleur
ac80d4057d Fix several running time errors 2017-01-16 09:30:28 +01:00
frederic34
73fda2cb86 WIP PSR2 2015-01-08 18:36:03 +01:00
Raphaël Doursenaud
c48c3a9d91 Qual: remove PHP closing tag (again)
These were reintroduced by careless merge
2014-05-26 13:51:25 +02:00
Laurent Destailleur
19fb5e5085 Try to fix phpunit error with new version. 2014-05-01 19:57:53 +02:00
Laurent Destailleur
c1ee59eef9 Qual: Add phpunit tests for margin lib 2013-12-16 14:10:52 +01:00