vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #32815 from FHenry/20_fix_php_warning_convertToWord_with_negatives_figures

Browse source 
fix php warning in dol_convertToWord when negative numbers
This commit is contained in:
Laurent Destailleur 2025-01-28 23:52:47 +01:00 committed by GitHub
commit e207f536bc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
htdocs/compta/facture/card.php
View file

@ -875,11 +875,29 @@ if (empty($reshook)) {
if ($line->product_type < 9 && $line->total_ht != 0) { // Remove lines with product_type greater than or equal to 9 and no need to create discount if amount is null
$keyforvatrate = $line->tva_tx.($line->vat_src_code ? ' ('.$line->vat_src_code.')' : '');
if (!isset($amount_ht[$keyforvatrate])) {
$amount_ht[$keyforvatrate]=0;
}
$amount_ht[$keyforvatrate] += $line->total_ht;
if (!isset($amount_tva[$keyforvatrate])) {
$amount_tva[$keyforvatrate]=0;
}
$amount_tva[$keyforvatrate] += $line->total_tva;
if (!isset($amount_ttc[$keyforvatrate])) {
$amount_ttc[$keyforvatrate]=0;
}
$amount_ttc[$keyforvatrate] += $line->total_ttc;
if (!isset($multicurrency_amount_ht[$keyforvatrate])) {
$multicurrency_amount_ht[$keyforvatrate]=0;
}
$multicurrency_amount_ht[$keyforvatrate] += $line->multicurrency_total_ht;
if (!isset($multicurrency_amount_tva[$keyforvatrate])) {
$multicurrency_amount_tva[$keyforvatrate]=0;
}
$multicurrency_amount_tva[$keyforvatrate] += $line->multicurrency_total_tva;
if (!isset($multicurrency_amount_ttc[$keyforvatrate])) {
$multicurrency_amount_ttc[$keyforvatrate]=0;
}
$multicurrency_amount_ttc[$keyforvatrate] += $line->multicurrency_total_ttc;
$i++;
}

2
htdocs/core/lib/functionsnumtoword.lib.php
View file

@ -51,7 +51,7 @@ function dol_convertToWord($num, $langs, $currency = '', $centimes = false)
} else {
$TNum = explode('.', (string) $num);
$num = (int) $TNum[0];
$num = abs((int) $TNum[0]);
$words = array();
$list1 = array(
'',