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

Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0

Browse Source 
Conflicts:
	htdocs/takepos/index.php
This commit is contained in:
Laurent Destailleur
2021-11-11 18:34:04 +01:00
parent ddad00c8e4 a725ffefdd
commit f5a7275077
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/phpunit/FunctionsLibTest.php
View File

@@ -1321,8 +1321,8 @@ class FunctionsLibTest extends PHPUnit\Framework\TestCase
$this->assertEquals(1, price2num('1.000'), 'Test 1.000 give 1 with english language');
// Text can't be converted
$this->assertEquals('12.4$', price2num('12.4$'));
$this->assertEquals('12.4$', price2num('12r.4$'));
$this->assertEquals('12.4', price2num('12.4$'));
$this->assertEquals('12.4', price2num('12r.4$'));
// For spanish language
$newlangs2 = new Translate('', $conf);