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

Conflicts: test/phpunit/CoreTest.php test/phpunit/Functions2Test.php test/phpunit/FunctionsTest.php
2014-05-18 11:57:18 +02:00 · 2014-05-18 11:57:18 +02:00 · 0e13ded641
commit 0e13ded641
parent ab337c7485 7216b2a843
15 changed files with 15 additions and 15 deletions
--- a/test/phpunit/CategorieTest.php
+++ b/test/phpunit/CategorieTest.php
@ -336,4 +336,4 @@ class CategorieTest extends PHPUnit_Framework_TestCase
    }

 }
-?>
+?>
--- a/test/phpunit/CompanyBankAccountTest.php
+++ b/test/phpunit/CompanyBankAccountTest.php
@ -233,4 +233,4 @@ class CompanyBankAccountTest extends PHPUnit_Framework_TestCase
    }

 }
-?>
+?>
--- a/test/phpunit/CoreTest.php
+++ b/test/phpunit/CoreTest.php
@ -297,4 +297,4 @@ class CoreTest extends PHPUnit_Framework_TestCase
 		$this->assertEquals($result,$expectedresult);
    }
 }
-?>
+?>
--- a/test/phpunit/DateLibTzFranceTest.php
+++ b/test/phpunit/DateLibTzFranceTest.php
@ -199,4 +199,4 @@ class DateLibTzFranceTest extends PHPUnit_Framework_TestCase
    }

 }
-?>
+?>
--- a/test/phpunit/ExportTest.php
+++ b/test/phpunit/ExportTest.php
@ -265,4 +265,4 @@ class ExportTest extends PHPUnit_Framework_TestCase
        return true;
    }
 }
-?>
+?>
--- a/test/phpunit/FactureTest.php
+++ b/test/phpunit/FactureTest.php
@ -329,4 +329,4 @@ class FactureTest extends PHPUnit_Framework_TestCase
        return $retAr;
    }
 }
-?>
+?>
--- a/test/phpunit/FactureTestRounding.php
+++ b/test/phpunit/FactureTestRounding.php
@ -333,4 +333,4 @@ class FactureTestRounding extends PHPUnit_Framework_TestCase
    }

 }
-?>
+?>
--- a/test/phpunit/ImportTest.php
+++ b/test/phpunit/ImportTest.php
@ -134,4 +134,4 @@ class ImportTest extends PHPUnit_Framework_TestCase
    }

 }
-?>
+?>
--- a/test/phpunit/JsonLibTest.php
+++ b/test/phpunit/JsonLibTest.php
@ -170,4 +170,4 @@ class JsonLibTest extends PHPUnit_Framework_TestCase
    }

 }
-?>
+?>
--- a/test/phpunit/ModulesTest.php
+++ b/test/phpunit/ModulesTest.php
@ -146,4 +146,4 @@ class ModulesTest extends PHPUnit_Framework_TestCase
    }

 }
-?>
+?>
--- a/test/phpunit/PropalTest.php
+++ b/test/phpunit/PropalTest.php
@ -287,4 +287,4 @@ class PropalTest extends PHPUnit_Framework_TestCase
    }

 }
-?>
+?>
--- a/test/phpunit/WebservicesInvoicesTest.php
+++ b/test/phpunit/WebservicesInvoicesTest.php
@ -176,4 +176,4 @@ class WebservicesInvoicesTest extends PHPUnit_Framework_TestCase
    }

 }
-?>
+?>
--- a/test/phpunit/WebservicesOrdersTest.php
+++ b/test/phpunit/WebservicesOrdersTest.php
@ -175,4 +175,4 @@ class WebservicesOrdersTest extends PHPUnit_Framework_TestCase
    }

 }
-?>
+?>
--- a/test/phpunit/WebservicesOtherTest.php
+++ b/test/phpunit/WebservicesOtherTest.php
@ -176,4 +176,4 @@ class WebservicesOtherTest extends PHPUnit_Framework_TestCase
    }

 }
-?>
+?>
--- a/test/phpunit/WebservicesThirdpartyTest.php
+++ b/test/phpunit/WebservicesThirdpartyTest.php
@ -176,4 +176,4 @@ class WebservicesThirdpartyTest extends PHPUnit_Framework_TestCase
    }

 }
-?>
+?>