Correct presentation

This commit is contained in:
aspangaro 2016-09-24 14:47:51 +02:00
parent f1166f1898
commit 8dc6a8fd1d
3 changed files with 20 additions and 18 deletions

View File

@ -3,8 +3,8 @@
* Copyright (C) 2007-2011 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2007-2011 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2009-2012 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2009-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2011-2016 Juanjo Menent <jmenent@2byte.es> * Copyright (C) 2011-2016 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2013 Philippe Grand <philippe.grand@atoo-net.com> * Copyright (C) 2013 Philippe Grand <philippe.grand@atoo-net.com>
* Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com> * Copyright (C) 2015-2016 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -21,9 +21,9 @@
*/ */
/** /**
* \file htdocs/compta/paiement/cheque/card.php * \file htdocs/compta/paiement/cheque/card.php
* \ingroup bank, invoice * \ingroup bank, invoice
* \brief Page for cheque deposits * \brief Page for cheque deposits
*/ */
require '../../../main.inc.php'; require '../../../main.inc.php';
@ -298,7 +298,9 @@ if (GETPOST('removefilter'))
$filteraccountid=0; $filteraccountid=0;
} }
llxHeader(); $title=$langs->trans("Cheques") . " - " . $langs->trans("Card");
$helpurl="";
llxHeader("",$title,$helpurl);
$form = new Form($db); $form = new Form($db);
$formfile = new FormFile($db); $formfile = new FormFile($db);
@ -386,7 +388,7 @@ if ($action == 'new')
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
//print '<tr><td width="30%">'.$langs->trans('Date').'</td><td width="70%">'.dol_print_date($now,'day').'</td></tr>'; //print '<tr><td width="30%">'.$langs->trans('Date').'</td><td width="70%">'.dol_print_date($now,'day').'</td></tr>';
// Filter // Filter
print '<tr><td width="200">'.$langs->trans("DateChequeReceived").'</td><td>'; print '<tr><td class="titlefieldcreate">'.$langs->trans("DateChequeReceived").'</td><td>';
print $form->select_date($filterdate,'fd',0,0,1,'',1,1,1); print $form->select_date($filterdate,'fd',0,0,1,'',1,1,1);
print '</td></tr>'; print '</td></tr>';
print '<tr><td>'.$langs->trans("BankAccount").'</td><td>'; print '<tr><td>'.$langs->trans("BankAccount").'</td><td>';
@ -502,7 +504,7 @@ if ($action == 'new')
print '<td>'.$value["emetteur"]."</td>\n"; print '<td>'.$value["emetteur"]."</td>\n";
print '<td>'.$value["banque"]."</td>\n"; print '<td>'.$value["banque"]."</td>\n";
print '<td align="right">'.price($value["amount"], 0, $langs, 1, -1, -1, $conf->currency).'</td>'; print '<td align="right">'.price($value["amount"], 0, $langs, 1, -1, -1, $conf->currency).'</td>';
// Link to payment // Link to payment
print '<td align="center">'; print '<td align="center">';
$paymentstatic->id=$value["paymentid"]; $paymentstatic->id=$value["paymentid"];
@ -528,7 +530,7 @@ if ($action == 'new')
print '&nbsp;'; print '&nbsp;';
} }
print '</td>'; print '</td>';
print '<td align="center">'; print '<td align="center">';
print '<input id="'.$value["id"].'" class="flat checkforremise_'.$bid.'" checked type="checkbox" name="toRemise[]" value="'.$value["id"].'">'; print '<input id="'.$value["id"].'" class="flat checkforremise_'.$bid.'" checked type="checkbox" name="toRemise[]" value="'.$value["id"].'">';
print '</td>' ; print '</td>' ;
@ -563,7 +565,7 @@ else
$accountstatic->label=$object->account_label; $accountstatic->label=$object->account_label;
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td width=20%>'; print '<tr><td class="titlefield">';
print '<table class="nobordernopadding" width="100%"><tr><td>'; print '<table class="nobordernopadding" width="100%"><tr><td>';
print $langs->trans('Ref'); print $langs->trans('Ref');
@ -760,7 +762,7 @@ else
dol_print_error($db); dol_print_error($db);
} }
dol_fiche_end(); dol_fiche_end();
} }

View File

@ -122,7 +122,7 @@ if ($nb < 0 || $nb1 < 0 || $nb11 < 0)
} }
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td>'.$langs->trans("NbOfInvoiceToWithdraw").'</td>'; print '<tr><td class="titlefield">'.$langs->trans("NbOfInvoiceToWithdraw").'</td>';
print '<td align="right">'; print '<td align="right">';
print $nb; print $nb;
print '</td></tr>'; print '</td></tr>';

View File

@ -1,7 +1,7 @@
<?php <?php
/* Copyright (C) 2008-2012 Laurent Destailleur <eldy@users.sourceforge.net> /* Copyright (C) 2008-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2008-2012 Regis Houssin <regis.houssin@capnetworks.com> * Copyright (C) 2008-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2015 Alexandre Spangaro <aspangaro.dolibarr@gmail.com> * Copyright (C) 2015-2016 Alexandre Spangaro <aspangaro.dolibarr@gmail.com>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -18,9 +18,9 @@
*/ */
/** /**
* \file htdocs/ecm/docdir.php * \file htdocs/ecm/docdir.php
* \ingroup ecm * \ingroup ecm
* \brief Main page for ECM section area * \brief Main page for ECM section area
*/ */
require '../main.inc.php'; require '../main.inc.php';
@ -160,7 +160,7 @@ if ($action == 'create')
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
// Label // Label
print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input name="label" size="40" maxlength="32" value="'.$ecmdir->label.'"></td></tr>'."\n"; print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Label").'</td><td><input name="label" size="40" maxlength="32" value="'.$ecmdir->label.'"></td></tr>'."\n";
print '<tr><td>'.$langs->trans("AddIn").'</td><td>'; print '<tr><td>'.$langs->trans("AddIn").'</td><td>';
print $formecm->select_all_sections(! empty($_GET["catParent"])?$_GET["catParent"]:$ecmdir->fk_parent,'catParent'); print $formecm->select_all_sections(! empty($_GET["catParent"])?$_GET["catParent"]:$ecmdir->fk_parent,'catParent');
@ -176,7 +176,7 @@ if ($action == 'create')
print '</td></tr>'."\n"; print '</td></tr>'."\n";
print '</table><br>'; print '</table><br>';
dol_fiche_end(); dol_fiche_end();
print '<div class="center">'; print '<div class="center">';