diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php index cf479140598..b26100b2cca 100644 --- a/htdocs/compta/facture/apercu.php +++ b/htdocs/compta/facture/apercu.php @@ -109,6 +109,7 @@ if ($_GET["facid"] > 0) // Remise globale print ''.$langs->trans('GlobalDiscount').''; +/* if ($fac->brouillon == 1 && $user->rights->facture->creer) { print '
'; @@ -119,12 +120,14 @@ if ($_GET["facid"] > 0) } else { +*/ print ''.$fac->remise_percent.'%'; - } +// } $nbrows=5; if ($conf->global->FAC_USE_CUSTOMER_ORDER_REF) $nbrows++; - print ''; + if ($conf->projet->enabled) $nbrows++; + print ''; /* * Documents @@ -199,9 +202,9 @@ if ($_GET["facid"] > 0) imagick_writeimages( $handle, $file .".png"); } else - { - $langs->load("other"); - print ''.$langs->trans("ErrorNoImagickReadimage").''; + { + $langs->load("other"); + print ''.$langs->trans("ErrorNoImagickReadimage").''; } }