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

Conflicts: test/phpunit/CoreTest.php test/phpunit/Functions2Test.php test/phpunit/FunctionsTest.php

Merge remote-tracking branch 'origin/3.4' into 3.5
0e13ded6 · Laurent Destailleur · ab337c74 · 7216b2a8 · 0e13ded6 · 0e13ded6
Commit 0e13ded6 authored 11 years ago by Laurent Destailleur
--- a/test/phpunit/CategorieTest.php
+++ b/test/phpunit/CategorieTest.php
--- a/test/phpunit/CompanyBankAccountTest.php
+++ b/test/phpunit/CompanyBankAccountTest.php
--- a/test/phpunit/CoreTest.php
+++ b/test/phpunit/CoreTest.php
--- a/test/phpunit/DateLibTzFranceTest.php
+++ b/test/phpunit/DateLibTzFranceTest.php
--- a/test/phpunit/ExportTest.php
+++ b/test/phpunit/ExportTest.php
--- a/test/phpunit/FactureTest.php
+++ b/test/phpunit/FactureTest.php
--- a/test/phpunit/FactureTestRounding.php
+++ b/test/phpunit/FactureTestRounding.php
--- a/test/phpunit/ImportTest.php
+++ b/test/phpunit/ImportTest.php
--- a/test/phpunit/JsonLibTest.php
+++ b/test/phpunit/JsonLibTest.php
--- a/test/phpunit/ModulesTest.php
+++ b/test/phpunit/ModulesTest.php
--- a/test/phpunit/PropalTest.php
+++ b/test/phpunit/PropalTest.php
--- a/test/phpunit/WebservicesInvoicesTest.php
+++ b/test/phpunit/WebservicesInvoicesTest.php
--- a/test/phpunit/WebservicesOrdersTest.php
+++ b/test/phpunit/WebservicesOrdersTest.php
--- a/test/phpunit/WebservicesOtherTest.php
+++ b/test/phpunit/WebservicesOtherTest.php
--- a/test/phpunit/WebservicesThirdpartyTest.php
+++ b/test/phpunit/WebservicesThirdpartyTest.php