Merge pull request #12976 from mapiolca/patch-28

Add support of Number2Words module (v2)
This commit is contained in:
Laurent Destailleur 2020-02-02 19:54:49 +01:00 committed by GitHub
commit 86c1777702
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -44,6 +44,18 @@ function dol_convertToWord($num, $langs, $currency = false, $centimes = false)
if ($centimes && strlen($num) == 1) { if ($centimes && strlen($num) == 1) {
$num = $num*10; $num = $num*10;
} }
if (! empty($conf->global->MAIN_MODULE_NUMBERWORDS)) {
if ($currency == true) {
$type = 1;
}else{
$type = 0;
}
$concatWords = $langs->getLabelFromNumber($num, $type);
return $concatWords;
}else{
$TNum = explode('.', $num); $TNum = explode('.', $num);
$num = (int) $TNum[0]; $num = (int) $TNum[0];
$words = array(); $words = array();
@ -132,6 +144,7 @@ function dol_convertToWord($num, $langs, $currency = false, $centimes = false)
if(!empty($currency)) $concatWords .= ' '.$langs->transnoentities('centimes'); if(!empty($currency)) $concatWords .= ' '.$langs->transnoentities('centimes');
} }
return $concatWords; return $concatWords;
}
} }