Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix php warning in dol_convertToWord when negative numbers #32815

Merged
merged 2 commits into from
Jan 28, 2025
Merged

fix php warning in dol_convertToWord when negative numbers #32815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87e6d26
fix php warning in dol_convertToWord when negative numbers
FHenry Jan 27, 2025
9bb9ecd
fix: phpwarning version 8.0 for TVA calulation
FHenry Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions htdocs/compta/facture/card.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -875,11 +875,29 @@
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++;
}
Expand Down
2 changes: 1 addition & 1 deletion htdocs/core/lib/functionsnumtoword.lib.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
'',
Expand Down
Loading