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

Update functions2.lib.php

Browse Source
This commit is contained in:
Laurent Destailleur 2020-01-23 12:02:29 +01:00 committed by GitHub
parent 7f47b48559
commit 1487158082
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2356,16 +2356,17 @@ function price2fec($amount)
// Clean parameters // Clean parameters
if (empty($amount)) $amount=0; // To have a numeric value if amount not defined or = '' if (empty($amount)) $amount=0; // To have a numeric value if amount not defined or = ''
$amount = (is_numeric($amount)?$amount:0); // Check if amount is numeric, for example, an error occured when amount value = o (letter) instead 0 (number) $amount = (is_numeric($amount) ? $amount : 0); // Check if amount is numeric, for example, an error occured when amount value = o (letter) instead 0 (number)
// Output decimal number by default (french) // Output decimal number by default
$nbdecimal= 2; $nbdecimal = (empty($conf->global->ACCOUNTING_FEC_DECIMAL_LENGTH) ? 2 : $conf->global->ACCOUNTING_FEC_DECIMAL_LENGTH);
// Output separators by default (french) // Output separators by default
$dec=','; $thousand=''; $dec = (empty($conf->global->ACCOUNTING_FEC_DECIMAL_SEPARATOR) ? ',' : $conf->global->ACCOUNTING_FEC_DECIMAL_SEPARATOR);
$thousand = (empty($conf->global->ACCOUNTING_FEC_THOUSAND_SEPARATOR) ? '' : $conf->global->ACCOUNTING_FEC_THOUSAND_SEPARATOR);
// Format number // Format number
$output=number_format($amount, $nbdecimal, $dec, $thousand); $output = number_format($amount, $nbdecimal, $dec, $thousand);
return $output; return $output;
} }