lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.5' into develop

Browse Source 
Conflicts:
	test/phpunit/DateLibTzFranceTest.php
	test/phpunit/ModulesTest.php
This commit is contained in:
Laurent Destailleur 2014-05-18 11:59:51 +02:00
commit 01e3e13865
9 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/phpunit/CategorieTest.php
View File

@ -336,4 +336,4 @@ class CategorieTest extends PHPUnit_Framework_TestCase
} }
} }
?> ?>

2
test/phpunit/CompanyBankAccountTest.php
View File

@ -233,4 +233,4 @@ class CompanyBankAccountTest extends PHPUnit_Framework_TestCase
} }
} }
?> ?>

2
test/phpunit/CoreTest.php
View File

@ -297,4 +297,4 @@ class CoreTest extends PHPUnit_Framework_TestCase
$this->assertEquals($result,$expectedresult); $this->assertEquals($result,$expectedresult);
} }
} }
?> ?>

2
test/phpunit/ExportTest.php
View File

@ -265,4 +265,4 @@ class ExportTest extends PHPUnit_Framework_TestCase
return true; return true;
} }
} }
?> ?>

2
test/phpunit/FactureTest.php
View File

@ -329,4 +329,4 @@ class FactureTest extends PHPUnit_Framework_TestCase
return $retAr; return $retAr;
} }
} }
?> ?>

2
test/phpunit/FactureTestRounding.php
View File

@ -333,4 +333,4 @@ class FactureTestRounding extends PHPUnit_Framework_TestCase
} }
} }
?> ?>

2
test/phpunit/ImportTest.php
View File

@ -134,4 +134,4 @@ class ImportTest extends PHPUnit_Framework_TestCase
} }
} }
?> ?>

2
test/phpunit/JsonLibTest.php
View File

@ -170,4 +170,4 @@ class JsonLibTest extends PHPUnit_Framework_TestCase
} }
} }
?> ?>

2
test/phpunit/PropalTest.php
View File

@ -265,4 +265,4 @@ class PropalTest extends PHPUnit_Framework_TestCase
} }
} }
?> ?>