From 73f6abdeca061306191a917937fc637b18ba09b1 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 10 Dec 2009 12:20:52 +0000 Subject: [PATCH] Fix: view remise percent (negative or positive) --- htdocs/comm/propal.php | 4 ++-- htdocs/commande/fiche.php | 6 +++++- htdocs/compta/facture.php | 2 ++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 8cd306d2d94..a4b92ebcc56 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -1449,8 +1449,8 @@ if ($id > 0 || ! empty($ref)) else print ' '; print ''; - // Remise % - if ($objp->remise_percent > 0 && $objp->special_code != 3) + // Remise percent (negative or positive) + if (!empty($objp->remise_percent) && $objp->special_code != 3) { print ''.dol_print_reduction($objp->remise_percent,$langs)."\n"; } diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index 5e0ed9ccf11..f4225156be1 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -1657,7 +1657,9 @@ else } else print ' '; print ''; - if ($objp->remise_percent > 0) + + //Remise percent (negative or positive) + if (!empty($objp->remise_percent)) { print ''.dol_print_reduction($objp->remise_percent,$langs).''; } @@ -1665,6 +1667,8 @@ else { print ' '; } + + // Montant total HT print ''.price($objp->total_ht).''; // Icone d'edition et suppression diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index ee57fc02990..9f8bb8a4816 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -2869,6 +2869,8 @@ else { print ' '; } + + // Montant total HT print ''.price($objp->total_ht)."\n"; // Icone d'edition et suppression