From 8eee0bdf73caf24039dc43cca8fa7cc1b639b5cf Mon Sep 17 00:00:00 2001 From: aspangaro <alexandre.spangaro@gmail.com> Date: Wed, 27 May 2015 07:41:25 +0200 Subject: [PATCH] NEW Forms are using the tab look, even in creation mode --- htdocs/compta/facture.php | 8 +++++--- htdocs/compta/paiement.php | 6 +++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 88d6bb587e4..cdcb49e1b9c 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -3754,7 +3754,7 @@ if ($action == 'create') } print '<br>'; - //Select mail models is same action as presend + // Select mail models is same action as presend if (GETPOST('modelselected')) { $action = 'presend'; } @@ -3834,7 +3834,7 @@ if ($action == 'create') $i ++; } print '</table>'; - print '<div class="center"><input type="submit" class="button" value="' . $langs->trans('ToLink') . '"> <input type="submit" class="button" name="cancel" value="' . $langs->trans('Cancel') . '"></div>'; + print '<div class="center"><input type="submit" class="button" value="' . $langs->trans('ToLink') . '"> <input type="submit" class="button" name="cancel" value="' . $langs->trans('Cancel') . '"></div>'; print '</form>'; $db->free($resqlorderlist); } else { @@ -3919,6 +3919,8 @@ if ($action == 'create') print_titre($langs->trans($titreform)); // Cree l'objet formulaire mail + dol_fiche_head(); + include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php'; $formmail = new FormMail($db); $formmail->param['langsmodels']=(empty($newlang)?$langs->defaultlang:$newlang); @@ -3990,7 +3992,7 @@ if ($action == 'create') print $formmail->get_form(); - print '<br>'; + dol_fiche_end(); } } diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 58865c38540..98fe402266c 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -6,7 +6,7 @@ * Copyright (C) 2007 Franky Van Liedekerke <franky.van.liedekerke@telenet.be> * Copyright (C) 2012 Cédric Salvador <csalvador@gpcsolutions.fr> * Copyright (C) 2014 Raphaël Doursenaud <rdoursenaud@gpcsolutions.fr> - * Copyright (C) 2014 Teddy Andreotti <125155@supinfo.com> + * Copyright (C) 2014 Teddy Andreotti <125155@supinfo.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -403,6 +403,8 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie print '<input type="hidden" name="type" id="invoice_type" value="'.$facture->type.'">'; print '<input type="hidden" name="thirdpartylabel" id="thirdpartylabel" value="'.dol_escape_htmltag($facture->client->name).'">'; + dol_fiche_head(); + print '<table class="border" width="100%">'; // Third party @@ -462,6 +464,8 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie print '</table>'; + dol_fiche_end(); + /* * List of unpaid invoices */ -- GitLab