diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index dcb6fbc4e94..98cb3494a8b 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 1e74cd1c002..20ae7061a33 100644 --- a/htdocs/comm/remise.php +++ b/htdocs/comm/remise.php @@ -121,13 +121,14 @@ if ($_socid > 0) print ''; print $langs->trans("NoteReason").''; - print ''; - print ""; + print '
'; + print ""; - print "\n"; + dol_fiche_end(); + print '
'; diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php index 3a054a1b5e4..5893dcd16d3 100644 --- a/htdocs/comm/remx.php +++ b/htdocs/comm/remx.php @@ -274,18 +274,20 @@ if ($_socid > 0) print ''.$langs->trans("NoteReason").''; print ''; - print ''; + print ""; + + print '
'; print ''; if (GETPOST("backtopage")) { print '    '; print ''; } - print ''; + print '
'; - print ""; + print ''; - print "\n"; + dol_fiche_end(); print '
'; diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php index 2255de19e7a..eab9105745c 100644 --- a/htdocs/contrat/services.php +++ b/htdocs/contrat/services.php @@ -166,7 +166,7 @@ if ($resql) $arrayofoperators=array('<'=>'<','>'=>'>'); print $form->selectarray('filter_op1',$arrayofoperators,$_REQUEST['filter_op1'],1); print ' '; - $filter_date1=dol_mktime(0,0,0,$_REQUEST['op1month'],$_REQUEST['op1day'],$_REQUEST['"op1year']); + $filter_date1=dol_mktime(0,0,0,$_REQUEST['op1month'],$_REQUEST['op1day'],$_REQUEST['op1year']); print $form->select_date($filter_date1,'op1',0,0,1); print ''; print '';