lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: try to disable 1900 test

Browse Source
This commit is contained in:
Regis Houssin 2012-09-24 09:30:37 +02:00
parent a6b2eab439
commit c268a62cab
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/lib/functions2.lib.php
View File

@ -531,6 +531,8 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m
// For debugging // For debugging
//include_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php'); //include_once(DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php');
//$mask='{yyyy}-{0000}';
//$date=dol_mktime(12, 0, 0, 1, 1, 1900);
//$date=dol_stringtotime('20121001'); //$date=dol_stringtotime('20121001');
// Extract value for mask counter, mask raz and mask offset // Extract value for mask counter, mask raz and mask offset

4
test/phpunit/NumberingModulesTest.php
View File

@ -129,7 +129,7 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
require_once dirname(__FILE__).'/../../htdocs/compta/facture/class/facture.class.php'; require_once dirname(__FILE__).'/../../htdocs/compta/facture/class/facture.class.php';
require_once dirname(__FILE__).'/../../htdocs/core/modules/facture/mod_facture_mercure.php'; require_once dirname(__FILE__).'/../../htdocs/core/modules/facture/mod_facture_mercure.php';
/*
// First we try with a simple mask, with no reset // First we try with a simple mask, with no reset
// and we test counter is still increase second year. // and we test counter is still increase second year.
$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}-{0000}'; $conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}-{0000}';
@ -152,7 +152,7 @@ class NumberingModulesTest extends PHPUnit_Framework_TestCase
$result=$numbering->getNextValue($mysoc, $localobject); $result=$numbering->getNextValue($mysoc, $localobject);
print __METHOD__." result=".$result."\n"; print __METHOD__." result=".$result."\n";
$this->assertEquals('1901-0002', $result); // counter must not be reset $this->assertEquals('1901-0002', $result); // counter must not be reset
*/
// Now we try with a reset // Now we try with a reset
$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}-{0000@1}'; $conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}-{0000@1}';
$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}-{0000@1}'; $conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}-{0000@1}';