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

Try to fix false positive

Browse Source
This commit is contained in:
Laurent Destailleur 2013-09-10 15:45:36 +02:00
parent 9314859ead
commit e467d63a94
3 changed files with 985 additions and 968 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -79,7 +79,8 @@ before_script:
#script: phpunit -d memory_limit=-1 --configuration test/phpunit/phpunittest.xml test/phpunit/WebservicesOtherTest.php #script: phpunit -d memory_limit=-1 --configuration test/phpunit/phpunittest.xml test/phpunit/WebservicesOtherTest.php
#script: phpcs -s --report-checkstyle --report-summary --standard=dev/codesniffer/ruleset.xml --tab-width=4 --ignore=/build/html/,/documents/,/includes/,/test/report/ . #script: phpcs -s --report-checkstyle --report-summary --standard=dev/codesniffer/ruleset.xml --tab-width=4 --ignore=/build/html/,/documents/,/includes/,/test/report/ .
script: script:
- phpcs -s --report-checkstyle --report-summary --standard=dev/codesniffer/ruleset.xml --tab-width=4 --ignore=/build/html/,/documents/,/includes/,/test/report/ . - phpcs -s --report-checkstyle --report-checkstyle --report-summary --standard=dev/codesniffer/ruleset.xml --tab-width=4 --ignore=/build/html/,/documents/,/includes/,/test/report/ htdocs/core/class/dolgraph.class.php
# - phpcs -s --report-checkstyle --report-summary --standard=dev/codesniffer/ruleset.xml --tab-width=4 --ignore=/build/html/,/documents/,/includes/,/test/report/ .
- phpunit -d memory_limit=-1 --configuration test/phpunit/phpunittest.xml test/phpunit/AllTests.php - phpunit -d memory_limit=-1 --configuration test/phpunit/phpunittest.xml test/phpunit/AllTests.php
after_script: after_script:

1935
htdocs/core/class/dolgraph.class.php
View File

File diff suppressed because it is too large Load Diff

13
htdocs/fourn/facture/fiche.php
View File

@ -922,7 +922,20 @@ elseif ($action == 'builddoc')
exit; exit;
} }
} }
// Make calculation according to calculationrule
elseif ($action == 'calculate')
{
$calculationrule=GETPOST('calculationrule');
$object->fetch($id);
$object->fetch_thirdparty();
$result=$object->update_price(0,($calculationrule=='totalofround'?0:1));
if ($result <= 0)
{
dol_print_error($db,$result);
exit;
}
}
// Delete file in doc form // Delete file in doc form
elseif ($action == 'remove_file') elseif ($action == 'remove_file')
{ {