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

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

Browse Source
This commit is contained in:
Florian HENRY 2016-02-02 13:36:22 +01:00
commit 0ac7c364f9
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.travis.yml
View File

@ -290,12 +290,17 @@ script:
- | - |
echo "Unit testing" echo "Unit testing"
# Ensure we catch errors # Ensure we catch errors
set -e set +e
phpunit -d memory_limit=-1 -c test/phpunit/phpunittest.xml test/phpunit/AllTests.php phpunit -d memory_limit=-1 -c test/phpunit/phpunittest.xml test/phpunit/AllTests.php
set +e set +e
echo
- |
echo Output dolibarr.log
echo cat documents/dolibarr.log
after_success: after_success:
- |
echo Success
after_failure: after_failure:
- | - |
@ -315,4 +320,7 @@ after_failure:
fi fi
after_script: after_script:
- |
# Dolibarr log file
cat documents/dolibarr.log

4
test/phpunit/FunctionsLibTest.php
View File

@ -853,8 +853,8 @@ class FunctionsLibTest extends PHPUnit_Framework_TestCase
// Test RULE ES-ES // Test RULE ES-ES
$vat1=get_default_localtax($companyes,$companyes,1,0); $vat1=get_default_localtax($companyes,$companyes,1,0);
$vat2=get_default_localtax($companyes,$companyes,2,0); $vat2=get_default_localtax($companyes,$companyes,2,0);
$this->assertEquals(5.2,$vat1); $this->assertEquals($vat1, 5.2);
$this->assertEquals(-19,$vat2); $this->assertStringStartsWith((string) $vat2, '-19:-15:-9'); // Can be -19 (old version) or '-19:-15:-9' (new setup)
// Test RULE ES-IT // Test RULE ES-IT
$vat1=get_default_localtax($companyes,$companyit,1,0); $vat1=get_default_localtax($companyes,$companyit,1,0);