From 9f8071b77b25dacd5ab14e999e952256e37d9a9f Mon Sep 17 00:00:00 2001 From: Rodolphe Quiedeville Date: Mon, 15 Sep 2003 16:04:01 +0000 Subject: [PATCH] Modif calcul de la tva, correction des erreurs d'arrondies --- htdocs/propal.class.php | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/htdocs/propal.class.php b/htdocs/propal.class.php index 2ac06e3f692..af5fcbdd309 100644 --- a/htdocs/propal.class.php +++ b/htdocs/propal.class.php @@ -240,7 +240,7 @@ class Propal $totaltva=0; $totalttc=0; $total_remise=0; - + $t = 0; /* * Remise */ @@ -267,13 +267,17 @@ class Propal if ($remise_percent > 0) { - $lremise = ($lprice * $remise_percent / 100); - $total_remise = $total_remise + $lremise; - $lprice = $lprice - $lremise; + $ligne_remise = ($lprice * $remise_percent / 100); + $total_remise = $total_remise + $ligne_remise; + $lprice = $lprice - $ligne_remise; } $totalht = $totalht + $lprice; - $totaltva = $totaltva + (tva(($lprice), $obj->tva_tx)); + + $ligne_tva = ($lprice * ($obj->tva_tx / 100)); + + $totaltva = $totaltva + $ligne_tva; + $i++; } @@ -282,6 +286,8 @@ class Propal /* * Calcul TVA */ + $totaltva = round($totaltva, 2); + $totalht = round($totalht, 2); $totalttc = $totalht + $totaltva; /* *