Skip to content

Commit

Permalink
Fix: try to disable 1900 test
Browse files Browse the repository at this point in the history
  • Loading branch information
hregis committed Sep 24, 2012
1 parent a6b2eab commit c268a62
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 2 additions & 0 deletions htdocs/core/lib/functions2.lib.php
Expand Up @@ -531,6 +531,8 @@ function get_next_value($db,$mask,$table,$field,$where='',$objsoc='',$date='',$m

// For debugging
//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');

// Extract value for mask counter, mask raz and mask offset
Expand Down
4 changes: 2 additions & 2 deletions test/phpunit/NumberingModulesTest.php
Expand Up @@ -129,7 +129,7 @@ public function testFactureMercure()
require_once dirname(__FILE__).'/../../htdocs/compta/facture/class/facture.class.php';
require_once dirname(__FILE__).'/../../htdocs/core/modules/facture/mod_facture_mercure.php';


/*
// First we try with a simple mask, with no reset
// and we test counter is still increase second year.
$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}-{0000}';
Expand All @@ -152,7 +152,7 @@ public function testFactureMercure()
$result=$numbering->getNextValue($mysoc, $localobject);
print __METHOD__." result=".$result."\n";
$this->assertEquals('1901-0002', $result); // counter must not be reset

*/
// Now we try with a reset
$conf->global->FACTURE_MERCURE_MASK_CREDIT='{yyyy}-{0000@1}';
$conf->global->FACTURE_MERCURE_MASK_INVOICE='{yyyy}-{0000@1}';
Expand Down

0 comments on commit c268a62

Please sign in to comment.