Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

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

Browse Source 
Conflicts:
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_opensuse.spec
This commit is contained in:
Laurent Destailleur
2013-07-24 15:25:00 +02:00
parent 9babb6cc4a 7cf429d238
commit bf9b255c92
907 changed files with 71689 additions and 71684 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
test/phpunit/NumberingModulesTest.php
View File

@@ -160,10 +160,10 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
$result3=$localobject2->validate($user, $result); // create invoice by forcing ref
print __METHOD__." result=".$result."\n";
$this->assertEquals('1916-0002', $result); // counter must not be reseted so be 2
$result=$localobject2->is_erasable();
$result=$localobject2->is_erasable();
print __METHOD__." is_erasable=".$result."\n";
$this->assertEquals(1, $result); // Can be deleted
$result=$localobject->is_erasable();
$this->assertEquals(1, $result); // Can be deleted
$result=$localobject->is_erasable();
print __METHOD__." is_erasable=".$result."\n";
$this->assertEquals(0, $result); // Case 1 can not be deleted (case 2 is more recent)
@@ -191,9 +191,9 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
$result3=$localobject->validate($user, $result);
print __METHOD__." result=".$result."\n";
$this->assertEquals('192001-0001', $result); // counter must start to 1
$result=$localobject->is_erasable();
$result=$localobject->is_erasable();
print __METHOD__." is_erasable=".$result."\n";
$this->assertEquals(1, $result); // Can be deleted
$this->assertEquals(1, $result); // Can be deleted
$localobject2=new Facture($this->savdb);
$localobject2->initAsSpecimen();
@@ -204,12 +204,12 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
$result3=$localobject2->validate($user, $result);
print __METHOD__." result=".$result."\n";
$this->assertEquals('192101-0001', $result); // counter must be reseted to 1
$result=$localobject2->is_erasable();
$result=$localobject2->is_erasable();
print __METHOD__." is_erasable=".$result."\n";
$this->assertEquals(1, $result); // Can be deleted
$result=$localobject->is_erasable();
$this->assertEquals(1, $result); // Can be deleted
$result=$localobject->is_erasable();
print __METHOD__." is_erasable=".$result."\n";
$this->assertEquals(1, $result); // Case 1 can be deleted (because there was a reset for case 2)
$this->assertEquals(1, $result); // Case 1 can be deleted (because there was a reset for case 2)
// Try an offset when an invoice already exists
$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}{mm}-{0000+9990}';
@@ -232,9 +232,9 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
$result3=$localobject->validate($user, $result);
print __METHOD__." result=".$result."\n";
$this->assertEquals('193001-0001', $result); // counter must start to 1
$result=$numbering->getNextValue($mysoc, $localobject, 'last');
print __METHOD__." result for last=".$result."\n";
$this->assertEquals('193001-0001', $result); // last ref into reset range should be same than last created
$result=$numbering->getNextValue($mysoc, $localobject, 'last');
print __METHOD__." result for last=".$result."\n";
$this->assertEquals('193001-0001', $result); // last ref into reset range should be same than last created
$localobject=new Facture($this->savdb);
$localobject->initAsSpecimen();