Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
61e226fe43
@ -255,10 +255,10 @@ class SocieteTest extends PHPUnit_Framework_TestCase
|
||||
$localobject->idprof1=493861496;
|
||||
$localobject->idprof2=49386149600021;
|
||||
$result=$localobject->id_prof_check(1,$localobject); // Must be > 0
|
||||
print __METHOD__." true idprof1 result=".$result."\n";
|
||||
print __METHOD__." OK FR idprof1 result=".$result."\n";
|
||||
$this->assertGreaterThanOrEqual(1, $result);
|
||||
$result=$localobject->id_prof_check(2,$localobject); // Must be > 0
|
||||
print __METHOD__." true idprof2 result=".$result."\n";
|
||||
print __METHOD__." OK FR idprof2 result=".$result."\n";
|
||||
$this->assertGreaterThanOrEqual(1, $result);
|
||||
|
||||
// KO FR
|
||||
@ -266,17 +266,17 @@ class SocieteTest extends PHPUnit_Framework_TestCase
|
||||
$localobject->idprof1='id1ko';
|
||||
$localobject->idprof2='id2ko';
|
||||
$result=$localobject->id_prof_check(1,$localobject); // Must be <= 0
|
||||
print __METHOD__." wrong idprof1 result=".$result."\n";
|
||||
print __METHOD__." KO FR idprof1 result=".$result."\n";
|
||||
$this->assertLessThan(1, $result);
|
||||
$result=$localobject->id_prof_check(2,$localobject); // Must be <= 0
|
||||
print __METHOD__." wrong idprof2 result=".$result."\n";
|
||||
print __METHOD__." KO FR idprof2 result=".$result."\n";
|
||||
$this->assertLessThan(1, $result);
|
||||
|
||||
// KO ES
|
||||
$localobject->country_code='ES';
|
||||
$localobject->idprof1='id1ko';
|
||||
$result=$localobject->id_prof_check(1,$localobject); // Must be <= 0
|
||||
print __METHOD__." wrong idprof1 result=".$result."\n";
|
||||
print __METHOD__." KO ES idprof1 result=".$result."\n";
|
||||
$this->assertLessThan(1, $result);
|
||||
|
||||
// OK AR
|
||||
@ -284,10 +284,10 @@ class SocieteTest extends PHPUnit_Framework_TestCase
|
||||
$localobject->idprof1='id1ko';
|
||||
$localobject->idprof2='id2ko';
|
||||
$result=$localobject->id_prof_check(1,$localobject); // Must be > 0
|
||||
print __METHOD__." idprof1 result=".$result."\n";
|
||||
print __METHOD__." OK AR idprof1 result=".$result."\n";
|
||||
$this->assertGreaterThanOrEqual(0, $result);
|
||||
$result=$localobject->id_prof_check(2,$localobject); // Must be > 0
|
||||
print __METHOD__." idprof2 result=".$result."\n";
|
||||
print __METHOD__." OK AR idprof2 result=".$result."\n";
|
||||
$this->assertGreaterThanOrEqual(1, $result);
|
||||
|
||||
return $localobject;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user