diff --git a/test/phpunit/ReceptionTest.php b/test/phpunit/ReceptionTest.php index 777fbad03d5..ac9e3747b53 100644 --- a/test/phpunit/ReceptionTest.php +++ b/test/phpunit/ReceptionTest.php @@ -370,36 +370,6 @@ class ReceptionTest extends PHPUnit\Framework\TestCase return $obj; } - /** - * testReceptionMergeCompanies - * - * Check that a Reception referencing a Societe object being merged into - * another is correctly migrated to use the new Societe object. - * - * @param Object $localobject An existing validated Reception object to mark as Draft. - * @return Reception A Reception object with data fetched - * - * @depends testReceptionSetDraft - */ - public function testReceptionMergeCompanies($localobject) - { - global $db, $user; - $soc2 = new Societe($db); - $soc2->name = "Test reception"; - $soc2_id = $soc2->create($user); - $this->assertLessThanOrEqual($soc2_id, 0, "Cannot create second Societe object:\n". - $soc2->errorsToString()); - - $result = $soc2->mergeCompany($localobject->id); - $this->assertLessThanOrEqual($result, 0, "Cannot merge Societe object:\n". - $soc2->errorsToString()); - - print __METHOD__." result=".$result."\n"; - $this->assertLessThanOrEqual($result, 0); - - return $result; - } - /** * testReceptionDelete *