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

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

Browse Source 
Conflicts:
	test/phpunit/CoreTest.php
	test/phpunit/Functions2Test.php
	test/phpunit/FunctionsTest.php
This commit is contained in:
Laurent Destailleur 2014-05-18 11:57:18 +02:00
commit 0e13ded641
15 changed files with 15 additions and 15 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/DateLibTzFranceTest.php
View File

@ -199,4 +199,4 @@ class DateLibTzFranceTest extends PHPUnit_Framework_TestCase
} }
} }
?> ?>

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/ModulesTest.php
View File

@ -146,4 +146,4 @@ class ModulesTest extends PHPUnit_Framework_TestCase
} }
} }
?> ?>

2
test/phpunit/PropalTest.php
View File

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

2
test/phpunit/WebservicesInvoicesTest.php
View File

@ -176,4 +176,4 @@ class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase
} }
} }
?> ?>

2
test/phpunit/WebservicesOrdersTest.php
View File

@ -175,4 +175,4 @@ class WebservicesOrdersTest extends PHPUnit_Framework_TestCase
} }
} }
?> ?>

2
test/phpunit/WebservicesOtherTest.php
View File

@ -176,4 +176,4 @@ class WebservicesOtherTest extends PHPUnit_Framework_TestCase
} }
} }
?> ?>

2
test/phpunit/WebservicesThirdpartyTest.php
View File

@ -176,4 +176,4 @@ class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase
} }
} }
?> ?>