From 71246c864abe29d98ec1a600025ce87d462dd35e Mon Sep 17 00:00:00 2001 From: Laurent Destailleur <eldy@destailleur.fr> Date: Tue, 8 Mar 2016 17:31:46 +0100 Subject: [PATCH] FIX Bad td balance and default checkbox value --- htdocs/commande/orderstoinvoice.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php index 79f18ad26ab..ebb9bedca2c 100644 --- a/htdocs/commande/orderstoinvoice.php +++ b/htdocs/commande/orderstoinvoice.php @@ -604,10 +604,11 @@ if (($action != 'create' && $action != 'add') || ($action == 'create' && $error) //REF print '<input class="flat" size="10" type="text" name="sref" value="'.$sref.'">'; print '</td>'; - //print '<td class="liste_titre">'; + print '<td class="liste_titre" align="left">'; print '<input class="flat" type="text" size="10" name="sref_client" value="'.$sref_client.'">'; - + print '</td>'; + //DATE ORDER print '<td class="liste_titre" align="center">'; print $period; @@ -619,15 +620,16 @@ if (($action != 'create' && $action != 'add') || ($action == 'create' && $error) print '</td>'; //SEARCH BUTTON - print '</td><td align="right" class="liste_titre">'; + print '<td align="right" class="liste_titre">'; print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"),'search.png','','',1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">'; - + print '</td>'; + //ALL/NONE - print '<td class="liste_titre" align="center">'; + print '<td align="center" class="liste_titre">'; if ($conf->use_javascript_ajax) print '<a href="#" id="checkall">'.$langs->trans("All").'</a> / <a href="#" id="checknone">'.$langs->trans("None").'</a>'; print '</td>'; - print '</td></tr>'; + print '</tr>'; print '</form>'; print '<form name="orders2invoice" action="orderstoinvoice.php" method="GET">'; @@ -697,7 +699,7 @@ if (($action != 'create' && $action != 'add') || ($action == 'create' && $error) /* * Boutons actions */ - print '<br><div class="center"><input type="checkbox" checked name="autocloseorders"> '.$langs->trans("CloseProcessedOrdersAutomatically"); + print '<br><div class="center"><input type="checkbox" '.(empty($conf->global->INVOICE_CLOSE_ORDERS_OFF_BY_DEFAULT_FORMASSINVOICE)?' checked="checked"':'').' name="autocloseorders"> '.$langs->trans("CloseProcessedOrdersAutomatically"); print '<div align="right">'; print '<input type="hidden" name="socid" value="'.$socid.'">'; print '<input type="hidden" name="action" value="create">'; -- GitLab