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

FIX travis check

Browse Source
This commit is contained in:
arnaud
2017-02-20 09:22:57 +01:00
parent 951ea51285
commit 26b8112d4e
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/core/lib/functionsnumtoword.lib.php
View File

@@ -29,14 +29,15 @@
* @deprecated * @deprecated
* @param float $numero Number to convert * @param float $numero Number to convert
* @param Lang $langs Language * @param Lang $langs Language
* @param string $numorcurrency 'number' or 'amount' * @param boolean $currency 0=number to translate | 1=currency to translate
* @return string Text of the number or -1 in case TOO LONG (more than 1000000000000.99) * @param boolean $centimes 0=no centimes | 1=centimes to translate
* @return string Text of the number
*/ */
function dol_convertToWord($num = false, $langs, $currency=false, $centimes=false) function dol_convertToWord($num=0, $langs, $currency=false, $centimes=false)
{ {
global $conf; global $conf;
$num = str_replace(array(',', ' '), '' , trim($num)); $num = str_replace(array(',', ' '), '', trim($num));
if(! $num) { if(! $num) {
return false; return false;
} }
@@ -89,6 +90,7 @@ function dol_convertToWord($num = false, $langs, $currency=false, $centimes=fals
$langs->transnoentitiesnoconv('trillion'), $langs->transnoentitiesnoconv('trillion'),
$langs->transnoentitiesnoconv('quadrillion') $langs->transnoentitiesnoconv('quadrillion')
); );
$num_length = strlen($num); $num_length = strlen($num);
$levels = (int) (($num_length + 2) / 3); $levels = (int) (($num_length + 2) / 3);
$max_length = $levels * 3; $max_length = $levels * 3;
@@ -103,7 +105,7 @@ function dol_convertToWord($num = false, $langs, $currency=false, $centimes=fals
if ( $tens < 20 ) { if ( $tens < 20 ) {
$tens = ($tens ? ' ' . $list1[$tens] . ' ' : '' ); $tens = ($tens ? ' ' . $list1[$tens] . ' ' : '' );
} else { } else {
$tens = (int)($tens / 10); $tens = (int) ($tens / 10);
$tens = ' ' . $list2[$tens] . ' '; $tens = ' ' . $list2[$tens] . ' ';
$singles = (int) ($num_levels[$i] % 10); $singles = (int) ($num_levels[$i] % 10);
$singles = ' ' . $list1[$singles] . ' '; $singles = ' ' . $list1[$singles] . ' ';

2
htdocs/core/modules/supplier_payment/pdf/pdf_cow.modules.php
View File

@@ -494,7 +494,7 @@ class pdf_cow extends ModelePDFSuppliersPayments
// translate amount // translate amount
$currency = $conf->currency; $currency = $conf->currency;
$translateinletter = strtoupper(dol_convertToWord($object->montant, $outputlangs ,$currency)); $translateinletter = strtoupper(dol_convertToWord($object->montant,$outputlangs,$currency));
$pdf->SetXY($this->marge_gauche + 50, $posy); $pdf->SetXY($this->marge_gauche + 50, $posy);
$pdf->MultiCell(90, 8, $translateinletter, 0, 'L', 1); $pdf->MultiCell(90, 8, $translateinletter, 0, 'L', 1);
$posy += 8; $posy += 8;