diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index 98cb3494a8b..dcb6fbc4e94 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -335,7 +335,7 @@ if ($socid > 0) print ''.img_edit($langs->trans("Modify")).''; } print ''; - print ''.($objsoc->remise_client?''.$objsoc->remise_client.'%':$langs->trans("DiscountNone")).''; + print ''.($objsoc->remise_client?$objsoc->remise_client.'%':$langs->trans("DiscountNone")).''; print ''; // Absolute discounts (Discounts-Drawbacks-Rebates) @@ -353,7 +353,7 @@ if ($socid > 0) print ''; $amount_discount=$objsoc->getAvailableDiscounts(); if ($amount_discount < 0) dol_print_error($db,$societe->error); - if ($amount_discount > 0) print ''.price($amount_discount).' '.$langs->trans("Currency".$conf->monnaie); + if ($amount_discount > 0) print price($amount_discount).' '.$langs->trans("Currency".$conf->monnaie); else print $langs->trans("DiscountNone"); print ''; print ''; diff --git a/htdocs/comm/remise.php b/htdocs/comm/remise.php index 20ae7061a33..1e74cd1c002 100644 --- a/htdocs/comm/remise.php +++ b/htdocs/comm/remise.php @@ -121,14 +121,13 @@ if ($_socid > 0) print ''; print $langs->trans("NoteReason").''; - print ""; + print ''; - print '
'; + print ""; print ""; - dol_fiche_end(); - + print "\n"; print '
'; diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php index 5893dcd16d3..3a054a1b5e4 100644 --- a/htdocs/comm/remx.php +++ b/htdocs/comm/remx.php @@ -274,20 +274,18 @@ if ($_socid > 0) print ''.$langs->trans("NoteReason").''; print ''; - print ""; - - print '
'; + print ''; print ''; if (GETPOST("backtopage")) { print '    '; print ''; } - print '
'; + print ''; - print ''; + print ""; - dol_fiche_end(); + print "\n"; print '
';