lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix W3C errors in page forging

Browse Source
This commit is contained in:
Laurent Destailleur 2010-03-15 23:54:37 +00:00
parent f793dd7398
commit 465cc90759
51 changed files with 138 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -18,6 +18,7 @@ For developers:
- More comments in code. - More comments in code.
- Uniformize some code. - Uniformize some code.
- First delete of useless pre.inc.php files. - First delete of useless pre.inc.php files.
- Fix W3C errors in page forging.
***** ChangeLog for 2.8 compared to 2.7 ***** ***** ChangeLog for 2.8 compared to 2.7 *****

20
htdocs/admin/tools/dolibarr_export.php
View File

@ -181,7 +181,7 @@ if ($db->label == 'MySQL')
{ {
$fullpathofmysqldump=$conf->global->SYSTEMTOOLS_MYSQLDUMP; $fullpathofmysqldump=$conf->global->SYSTEMTOOLS_MYSQLDUMP;
} }
?><br /> ?><br>
<input type="text" name="mysqldump" size="80" <input type="text" name="mysqldump" size="80"
value="<?php echo $fullpathofmysqldump; ?>" /> value="<?php echo $fullpathofmysqldump; ?>" />
</div> </div>
@ -240,7 +240,7 @@ if ($db->label == 'MySQL')
<input type="checkbox" name="drop" value="1" id="checkbox_dump_drop" <input type="checkbox" name="drop" value="1" id="checkbox_dump_drop"
/> />
<label for="checkbox_dump_drop"><?php echo $langs->trans("AddDropTable"); ?></label><br /> <label for="checkbox_dump_drop"><?php echo $langs->trans("AddDropTable"); ?></label><br>
</fieldset> </fieldset>
<br> <br>
@ -259,32 +259,32 @@ if ($db->label == 'MySQL')
id="checkbox_dump_showcolumns" id="checkbox_dump_showcolumns"
/> />
<label for="checkbox_dump_showcolumns"> <label for="checkbox_dump_showcolumns">
<?php echo $langs->trans("NameColumn"); ?></label><br /> <?php echo $langs->trans("NameColumn"); ?></label><br>
<input type="checkbox" name="extended_ins" value="yes" <input type="checkbox" name="extended_ins" value="yes"
id="checkbox_dump_extended_ins" id="checkbox_dump_extended_ins"
/> />
<label for="checkbox_dump_extended_ins"> <label for="checkbox_dump_extended_ins">
<?php echo $langs->trans("ExtendedInsert"); ?></label><br /> <?php echo $langs->trans("ExtendedInsert"); ?></label><br>
<input type="checkbox" name="delayed" value="yes" <input type="checkbox" name="delayed" value="yes"
id="checkbox_dump_delayed" id="checkbox_dump_delayed"
/> />
<label for="checkbox_dump_delayed"> <label for="checkbox_dump_delayed">
<?php echo $langs->trans("DelayedInsert"); ?></label><br /> <?php echo $langs->trans("DelayedInsert"); ?></label><br>
<input type="checkbox" name="sql_ignore" value="yes" <input type="checkbox" name="sql_ignore" value="yes"
id="checkbox_dump_ignore" id="checkbox_dump_ignore"
/> />
<label for="checkbox_dump_ignore"> <label for="checkbox_dump_ignore">
Ignorer les erreurs de doublons (INSERT IGNORE)</label><br /> Ignorer les erreurs de doublons (INSERT IGNORE)</label><br>
<input type="checkbox" name="hexforbinary" value="yes" <input type="checkbox" name="hexforbinary" value="yes"
id="checkbox_hexforbinary" id="checkbox_hexforbinary"
checked="checked" /> checked="checked" />
<label for="checkbox_hexforbinary"> <label for="checkbox_hexforbinary">
<?php echo $langs->trans("EncodeBinariesInHexa"); ?></label><br /> <?php echo $langs->trans("EncodeBinariesInHexa"); ?></label><br>
</fieldset> </fieldset>
</fieldset> </fieldset>
@ -308,7 +308,7 @@ if ($db->label == 'PostgreSQL')
{ {
$fullpathofpgdump=$conf->global->SYSTEMTOOLS_POSTGRESQLDUMP; $fullpathofpgdump=$conf->global->SYSTEMTOOLS_POSTGRESQLDUMP;
} }
?><br /> ?><br>
<input type="text" name="postgresqldump" size="80" <input type="text" name="postgresqldump" size="80"
value="<?php echo $fullpathofpgdump; ?>" /> value="<?php echo $fullpathofpgdump; ?>" />
</div> </div>
@ -359,7 +359,7 @@ if ($db->label == 'PostgreSQL')
id="checkbox_dump_showcolumns" id="checkbox_dump_showcolumns"
/> />
<label for="checkbox_dump_showcolumns"> <label for="checkbox_dump_showcolumns">
<?php echo $langs->trans("NameColumn"); ?></label><br /> <?php echo $langs->trans("NameColumn"); ?></label><br>
</fieldset> </fieldset>
</fieldset> </fieldset>
@ -437,7 +437,7 @@ if ($db->label == 'PostgreSQL')
id="ch_latex_showcolumns" id="ch_latex_showcolumns"
checked="checked" /> checked="checked" />
<label for="ch_latex_showcolumns"> <label for="ch_latex_showcolumns">
Nom des colonnes</label><br /> Nom des colonnes</label><br>
<table> <table>
<tr><td><label for="latex_data_caption"> <tr><td><label for="latex_data_caption">
Sous-titre de la table</label></td> Sous-titre de la table</label></td>

4
htdocs/admin/tools/eaccelerator.php
View File

@ -332,10 +332,10 @@ if (function_exists('eaccelerator_get'))
create_key_table($res); create_key_table($res);
} }
print "<br /><br />"; print "<br><br>";
print "<hr />"; print "<hr />";
print '<table><tr><td class="center">'; print '<table><tr><td class="center">';
print '<strong>Eaccelerator is created by the eAccelerator team, <a href="http://eaccelerator.net">http://eaccelerator.net</a></strong><br /><br />'; print '<strong>Eaccelerator is created by the eAccelerator team, <a href="http://eaccelerator.net">http://eaccelerator.net</a></strong><br><br>';
print "</td></tr></table>"; print "</td></tr></table>";

6
htdocs/boutique/commande/fiche.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2003-2005 Éric Seigne <eric.seigne@ryxeo.com> * Copyright (C) 2003-2005 <EFBFBD>ric Seigne <eric.seigne@ryxeo.com>
* Copyright (C) 2004-2006 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2006 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -58,7 +58,7 @@ if ($_GET['id'])
print "</table>"; print "</table>";
print "<br />"; print "<br>";
/* /*
* Produits * Produits
@ -108,7 +108,7 @@ if ($_GET['id'])
* *
* *
*/ */
print "<br />"; print "<br>";
print '<table border="1" width="100%" cellspacing="0" cellpadding="4">'; print '<table border="1" width="100%" cellspacing="0" cellpadding="4">';
print "<tr>"; print "<tr>";

2
htdocs/cashdesk/templates/liste_articles.tpl.php
View File

@ -68,7 +68,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
$obj_facturation->calculTotaux(); $obj_facturation->calculTotaux();
$total_ttc = $obj_facturation->prix_total_ttc(); $total_ttc = $obj_facturation->prix_total_ttc();
echo ('<p class="cadre_prix_total">'.$langs->trans("Total").' : '.price2num($total_ttc, 'MT').' '.$conf->monnaie.'<br /></p>'."\n"); echo ('<p class="cadre_prix_total">'.$langs->trans("Total").' : '.price2num($total_ttc, 'MT').' '.$conf->monnaie.'<br></p>'."\n");
} else { } else {

4
htdocs/cashdesk/templates/ticket.tpl.php
View File

@ -95,8 +95,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
<?php print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&amp;file='.urlencode('/thumbs/'.$mysoc->logo_small).'">'; ?> <?php print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=companylogo&amp;file='.urlencode('/thumbs/'.$mysoc->logo_small).'">'; ?>
</div> </div>
<div class="infos"> <div class="infos">
<p class="adresse"><?php echo $mysoc->nom; ?><br /> <p class="adresse"><?php echo $mysoc->nom; ?><br>
<?php echo $mysoc->adresse; ?><br /> <?php echo $mysoc->adresse; ?><br>
<?php echo $mysoc->cp.' '.$mysoc->ville; ?></p> <?php echo $mysoc->cp.' '.$mysoc->ville; ?></p>
<?php <?php

2
htdocs/cashdesk/templates/validation1.tpl.php
View File

@ -67,7 +67,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
<form id="frmValidation" class="formulaire2" method="post" action="validation_verif.php?action=valide_facture"> <form id="frmValidation" class="formulaire2" method="post" action="validation_verif.php?action=valide_facture">
<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" /> <input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
<p class="note_label"><?php echo $langs->trans("Notes"); ?><br /><textarea class="textarea_note" name="txtaNotes"></textarea></p> <p class="note_label"><?php echo $langs->trans("Notes"); ?><br><textarea class="textarea_note" name="txtaNotes"></textarea></p>
<span><input class="bouton_validation" type="submit" name="btnValider" value="<?php echo $langs->trans("ValidateInvoice"); ?>" /></span> <span><input class="bouton_validation" type="submit" name="btnValider" value="<?php echo $langs->trans("ValidateInvoice"); ?>" /></span>
<p><a class="lien1" href="affIndex.php?menu=facturation"><?php echo $langs->trans("RestartSelling"); ?></a></p> <p><a class="lien1" href="affIndex.php?menu=facturation"><?php echo $langs->trans("RestartSelling"); ?></a></p>

2
htdocs/categories/photos.php
View File

@ -136,7 +136,7 @@ if ($_GET["id"] || $_GET["ref"])
print '<a href="'.DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type.'">'.$langs->trans("Root").'</a> >> '; print '<a href="'.DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type.'">'.$langs->trans("Root").'</a> >> ';
foreach ($ways as $way) foreach ($ways as $way)
{ {
print $way."<br />\n"; print $way."<br>\n";
} }
print '</td></tr>'; print '</td></tr>';

2
htdocs/categories/viewcat.php
View File

@ -123,7 +123,7 @@ print $langs->trans("Ref").'</td><td>';
print '<a href="'.DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type.'">'.$langs->trans("Root").'</a> >> '; print '<a href="'.DOL_URL_ROOT.'/categories/index.php?leftmenu=cat&type='.$type.'">'.$langs->trans("Root").'</a> >> ';
foreach ($ways as $way) foreach ($ways as $way)
{ {
print $way."<br />\n"; print $way."<br>\n";
} }
print '</td></tr>'; print '</td></tr>';

2
htdocs/comm/index.php
View File

@ -113,7 +113,7 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
print '<tr '.$bc[$var].'><td nowrap>'.$langs->trans("Other").':</td><td><input type="text" class="flat" name="sall" size="18"></td>'; print '<tr '.$bc[$var].'><td nowrap>'.$langs->trans("Other").':</td><td><input type="text" class="flat" name="sall" size="18"></td>';
print '</tr>'; print '</tr>';
print "</table></form>\n"; print "</table></form>\n";
print "<br />\n"; print "<br>\n";
} }
/* /*

2
htdocs/comm/mailing/fiche.php
View File

@ -713,7 +713,7 @@ else
print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&amp;id='.$mil->id.'">'.$langs->trans("DeleteMailing").'</a>'; print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&amp;id='.$mil->id.'">'.$langs->trans("DeleteMailing").'</a>';
} }
print '<br /><br /></div>'; print '<br><br></div>';
} }
// Affichage formulaire de TEST // Affichage formulaire de TEST

2
htdocs/comm/propal.php
View File

@ -1687,7 +1687,7 @@ if ($id > 0 || ! empty($ref))
else print '&nbsp;'; else print '&nbsp;';
print '</td>'; print '</td>';
print '<td align="center" colspan="5" valign="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">'; print '<td align="center" colspan="5" valign="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
print '<br /><input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></td>'; print '<br><input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></td>';
print '</tr>' . "\n"; print '</tr>' . "\n";
/* /*
if ($conf->service->enabled) if ($conf->service->enabled)

6
htdocs/commande/fiche.php
View File

@ -1042,7 +1042,7 @@ if ($_GET['action'] == 'create' && $user->rights->commande->creer)
print '<input type="hidden" name="socid" value="'.$soc->id.'">' ."\n"; print '<input type="hidden" name="socid" value="'.$soc->id.'">' ."\n";
print '<input type="hidden" name="remise_percent" value="'.$soc->remise_client.'">'; print '<input type="hidden" name="remise_percent" value="'.$soc->remise_client.'">';
print '<input name="facnumber" type="hidden" value="provisoire">'; print '<input name="facnumber" type="hidden" value="provisoire">';
if (isset($_GET["origin"]) && $_GET["origin"] != 'project' && isset($_GET["originid"])) if (isset($_GET["origin"]) && $_GET["origin"] != 'project' && isset($_GET["originid"]))
{ {
print '<input type="hidden" name="origin" value="'.$_GET["origin"].'">'; print '<input type="hidden" name="origin" value="'.$_GET["origin"].'">';
@ -1123,7 +1123,7 @@ if ($_GET['action'] == 'create' && $user->rights->commande->creer)
{ {
$projectid = 0; $projectid = 0;
if (isset($_GET["origin"]) && $_GET["origin"] == 'project') $projectid = ($_GET["originid"]?$_GET["originid"]:0); if (isset($_GET["origin"]) && $_GET["origin"] == 'project') $projectid = ($_GET["originid"]?$_GET["originid"]:0);
print '<tr><td>'.$langs->trans('Project').'</td><td colspan="2">'; print '<tr><td>'.$langs->trans('Project').'</td><td colspan="2">';
$numprojet=select_projects($soc->id,$projectid); $numprojet=select_projects($soc->id,$projectid);
if ($numprojet==0) if ($numprojet==0)
@ -1892,7 +1892,7 @@ else
else print '&nbsp;'; else print '&nbsp;';
print '</td>'; print '</td>';
print '<td align="center" colspan="4"><input type="submit" class="button" name="save" value="'.$langs->trans('Save').'">'; print '<td align="center" colspan="4"><input type="submit" class="button" name="save" value="'.$langs->trans('Save').'">';
print '<br /><input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'"></td>'; print '<br><input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'"></td>';
print '</tr>'; print '</tr>';
// Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html) // Added by Matelli (See http://matelli.fr/showcases/patchs-dolibarr/add-dates-in-order-lines.html)

28
htdocs/compta/export/index.php
View File

@ -49,17 +49,17 @@ $dir = $conf->compta->dir_output."/export/".$year."/";
/* /*
* Actions * Actions
*/ */
if ($_GET["action"] == 'export') if ($_GET["action"] == 'export')
{ {
$modulename='Poivre'; $modulename='Poivre';
include_once DOL_DOCUMENT_ROOT.'/compta/export/modules/compta.export.class.php'; include_once DOL_DOCUMENT_ROOT.'/compta/export/modules/compta.export.class.php';
create_exdir($dir); create_exdir($dir);
$exc = new ComptaExport($db, $user, $modulename); $exc = new ComptaExport($db, $user, $modulename);
if($_GET["id"] > 0) if($_GET["id"] > 0)
{ {
$exc->Export($_GET["id"], $dir); $exc->Export($_GET["id"], $dir);
@ -68,14 +68,14 @@ if ($_GET["action"] == 'export')
{ {
$exc->Export(0, $dir); $exc->Export(0, $dir);
} }
/* Génération du journal des Paiements */ /* G<EFBFBD>n<EFBFBD>ration du journal des Paiements */
$jp= new ComptaJournalPaiement($db); $jp= new ComptaJournalPaiement($db);
$jp->GeneratePdf($user, $dir, $exc->id, $exc->ref); $jp->GeneratePdf($user, $dir, $exc->id, $exc->ref);
/* Génération du journal des Ventes */ /* G<EFBFBD>n<EFBFBD>ration du journal des Ventes */
$jp= new ComptaJournalVente($db); $jp= new ComptaJournalVente($db);
$jp->GeneratePdf($user, $dir, $exc->id, $exc->ref); $jp->GeneratePdf($user, $dir, $exc->id, $exc->ref);
} }
@ -83,7 +83,7 @@ if ($_GET["action"] == 'export')
/* /*
* Affichage page * Affichage page
*/ */
llxHeader('','Compta - Export'); llxHeader('','Compta - Export');
print_fiche_titre($langs->trans("AccountancyExport")); print_fiche_titre($langs->trans("AccountancyExport"));
@ -125,7 +125,7 @@ $var=false;
print '<tr '.$bc[$var].'><td>'.$langs->trans("Invoices").'</td><td align="right">'.$nbfac.'</td></tr>'; print '<tr '.$bc[$var].'><td>'.$langs->trans("Invoices").'</td><td align="right">'.$nbfac.'</td></tr>';
$var=!$var; $var=!$var;
print '<tr '.$bc[$var].'><td>'.$langs->trans("Payments").'</td><td align="right">'.$nbp.'</td></tr>'; print '<tr '.$bc[$var].'><td>'.$langs->trans("Payments").'</td><td align="right">'.$nbp.'</td></tr>';
print "</table><br />\n"; print "</table><br>\n";
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
@ -164,7 +164,7 @@ if ($handle)
{ {
if (is_readable($dir.$file) && is_file($dir.$file)) if (is_readable($dir.$file) && is_file($dir.$file))
{ {
print '<tr><td><a href="'.DOL_URL_ROOT.'/document.php?modulepart=export_compta&amp;file=export/'.$year.'/'.$file.'&amp;type=text/plain">'.$file.'</a><td>'; print '<tr><td><a href="'.DOL_URL_ROOT.'/document.php?modulepart=export_compta&amp;file=export/'.$year.'/'.$file.'&amp;type=text/plain">'.$file.'</a><td>';
print '</tr>'; print '</tr>';
} }
} }

6
htdocs/compta/paiement/cheque/fiche.php
View File

@ -227,7 +227,7 @@ if ($_GET['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>';
print '</table><br />'; print '</table><br>';
$sql = "SELECT ba.rowid as bid, ".$db->pdate("b.dateo")." as date,"; $sql = "SELECT ba.rowid as bid, ".$db->pdate("b.dateo")." as date,";
$sql.= " b.amount, ba.label, b.emetteur, b.num_chq, b.banque"; $sql.= " b.amount, ba.label, b.emetteur, b.num_chq, b.banque";
@ -303,7 +303,7 @@ if ($_GET['action'] == 'new')
{ {
print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('NewCheckDepositOn',$account_label).'</a>'; print '<a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('NewCheckDepositOn',$account_label).'</a>';
} }
print '</div><br />'; print '</div><br>';
} }
} }
@ -343,7 +343,7 @@ else
print $remisecheque->getLibStatut(4); print $remisecheque->getLibStatut(4);
print '</td></tr>'; print '</td></tr>';
print '</table><br />'; print '</table><br>';
// Liste des cheques // Liste des cheques

38
htdocs/compta/prelevement/bon.php
View File

@ -16,11 +16,11 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
/** /**
\file htdocs/compta/prelevement/bon.php \file htdocs/compta/prelevement/bon.php
\ingroup prelevement \ingroup prelevement
\brief Fiche aperçu du bon de prelevement \brief Fiche aper<EFBFBD>u du bon de prelevement
\version $Id$ \version $Id$
*/ */
@ -29,41 +29,41 @@ require("./pre.inc.php");
$langs->load("bills"); $langs->load("bills");
/* /*
* Sécurité accés client * S<EFBFBD>curit<EFBFBD> acc<EFBFBD>s client
*/ */
if (!$user->rights->prelevement->bons->lire) accessforbidden(); if (!$user->rights->prelevement->bons->lire) accessforbidden();
llxHeader('','Bon de prélèvement'); llxHeader('','Bon de pr<EFBFBD>l<EFBFBD>vement');
$h = 0; $h = 0;
$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/fiche.php?id='.$_GET["id"]; $head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/fiche.php?id='.$_GET["id"];
$head[$h][1] = $langs->trans("Card"); $head[$h][1] = $langs->trans("Card");
$h++; $h++;
if ($conf->use_preview_tabs) if ($conf->use_preview_tabs)
{ {
$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/bon.php?id='.$_GET["id"]; $head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/bon.php?id='.$_GET["id"];
$head[$h][1] = $langs->trans("Preview"); $head[$h][1] = $langs->trans("Preview");
$hselected = $h; $hselected = $h;
$h++; $h++;
} }
$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/lignes.php?id='.$_GET["id"]; $head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/lignes.php?id='.$_GET["id"];
$head[$h][1] = $langs->trans("Lines"); $head[$h][1] = $langs->trans("Lines");
$h++; $h++;
$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/factures.php?id='.$_GET["id"]; $head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/factures.php?id='.$_GET["id"];
$head[$h][1] = $langs->trans("Bills"); $head[$h][1] = $langs->trans("Bills");
$h++; $h++;
$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/fiche-rejet.php?id='.$_GET["id"]; $head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/fiche-rejet.php?id='.$_GET["id"];
$head[$h][1] = $langs->trans("Rejets"); $head[$h][1] = $langs->trans("Rejets");
$h++; $h++;
$head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/fiche-stat.php?id='.$_GET["id"]; $head[$h][0] = DOL_URL_ROOT.'/compta/prelevement/fiche-stat.php?id='.$_GET["id"];
$head[$h][1] = $langs->trans("Statistics"); $head[$h][1] = $langs->trans("Statistics");
$h++; $h++;
$prev_id = $_GET["id"]; $prev_id = $_GET["id"];
@ -75,7 +75,7 @@ if ($_GET["id"])
if ($bon->fetch($_GET["id"]) == 0) if ($bon->fetch($_GET["id"]) == 0)
{ {
dol_fiche_head($head, $hselected, 'Prélèvement : '. $bon->ref); dol_fiche_head($head, $hselected, 'Pr<EFBFBD>l<EFBFBD>vement : '. $bon->ref);
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
@ -88,7 +88,7 @@ if ($_GET["id"])
print '<a href="'.DOL_URL_ROOT.'/document.php?type=text/plain&amp;modulepart=prelevement&amp;file='.urlencode($relativepath).'">'.$bon->ref.'</a>'; print '<a href="'.DOL_URL_ROOT.'/document.php?type=text/plain&amp;modulepart=prelevement&amp;file='.urlencode($relativepath).'">'.$bon->ref.'</a>';
print '</td></tr>'; print '</td></tr>';
print '</table><br />'; print '</table><br>';
$fileimage = $conf->prelevement->dir_output.'/receipts/'.$bon->ref.'.ps.png.0'; $fileimage = $conf->prelevement->dir_output.'/receipts/'.$bon->ref.'.ps.png.0';
$fileps = $conf->prelevement->dir_output.'/receipts/'.$bon->ref.'.ps'; $fileps = $conf->prelevement->dir_output.'/receipts/'.$bon->ref.'.ps';
@ -101,25 +101,25 @@ if ($_GET["id"])
{ {
$handle = imagick_readimage( $fileps ) ; $handle = imagick_readimage( $fileps ) ;
if ( imagick_iserror( $handle ) ) if ( imagick_iserror( $handle ) )
{ {
$reason = imagick_failedreason( $handle ) ; $reason = imagick_failedreason( $handle ) ;
$description = imagick_faileddescription( $handle ) ; $description = imagick_faileddescription( $handle ) ;
print "handle failed!<BR>\nReason: $reason<BR>\nDescription: $description<BR>\n"; print "handle failed!<BR>\nReason: $reason<BR>\nDescription: $description<BR>\n";
} }
imagick_convert( $handle, "PNG" ) ; imagick_convert( $handle, "PNG" ) ;
if ( imagick_iserror( $handle ) ) if ( imagick_iserror( $handle ) )
{ {
$reason = imagick_failedreason( $handle ) ; $reason = imagick_failedreason( $handle ) ;
$description = imagick_faileddescription( $handle ) ; $description = imagick_faileddescription( $handle ) ;
print "handle failed!<BR>\nReason: $reason<BR>\nDescription: $description<BR>\n"; print "handle failed!<BR>\nReason: $reason<BR>\nDescription: $description<BR>\n";
} }
imagick_writeimage( $handle, $fileps .".png"); imagick_writeimage( $handle, $fileps .".png");
} }
else else
@ -131,7 +131,7 @@ if ($_GET["id"])
if (file_exists($fileimage)) if (file_exists($fileimage))
{ {
print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=prelevement&file='.urlencode(basename($fileimage)).'">'; print '<img src="'.DOL_URL_ROOT.'/viewimage.php?modulepart=prelevement&file='.urlencode(basename($fileimage)).'">';
} }
} }
else else

4
htdocs/compta/prelevement/demandes.php
View File

@ -20,7 +20,7 @@
/** /**
\file htdocs/compta/prelevement/demandes.php \file htdocs/compta/prelevement/demandes.php
\brief Page de la liste des demandes de prélèvements \brief Page de la liste des demandes de pr<EFBFBD>l<EFBFBD>vements
\version $Id$ \version $Id$
*/ */
@ -153,7 +153,7 @@ if ( $db->query($sql) )
$i++; $i++;
} }
print "</table><br />"; print "</table><br>";
} }
else else

4
htdocs/compta/prelevement/fiche.php
View File

@ -190,7 +190,7 @@ if ($_GET["id"])
print '</td></tr>'; print '</td></tr>';
} }
print '</table><br />'; print '</table><br>';
if($bon->date_trans == 0) if($bon->date_trans == 0)
{ {
@ -206,7 +206,7 @@ if ($_GET["id"])
print '</td></tr>'; print '</td></tr>';
print '<tr><td width="20%">'.$langs->trans("File").'</td><td>'; print '<tr><td width="20%">'.$langs->trans("File").'</td><td>';
print '<input type="hidden" name="max_file_size" value="'.$conf->maxfilesize.'">'; print '<input type="hidden" name="max_file_size" value="'.$conf->maxfilesize.'">';
print '<input class="flat" type="file" name="userfile" size="80"><br />'; print '<input class="flat" type="file" name="userfile" size="80"><br>';
print '</td></tr>'; print '</td></tr>';
print '<tr><td colspan="2" align="center">'; print '<tr><td colspan="2" align="center">';
print '<input type="submit" class="button" value="'.$langs->trans("Send").'">'; print '<input type="submit" class="button" value="'.$langs->trans("Send").'">';

2
htdocs/compta/prelevement/ligne.php
View File

@ -129,7 +129,7 @@ if ($_GET["id"])
} }
print '</table><br />'; print '</table><br>';
} }
else else
{ {

2
htdocs/compta/prelevement/stats.php
View File

@ -135,7 +135,7 @@ else
* Stats sur les rejets * Stats sur les rejets
* *
*/ */
print '<br />'; print '<br>';
print_titre($langs->trans("WithdrawRejectStatistics")); print_titre($langs->trans("WithdrawRejectStatistics"));

5
htdocs/contrat/fiche.php
View File

@ -831,7 +831,7 @@ else
print '<a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->fk_product.'">'; print '<a href="'.DOL_URL_ROOT.'/product/fiche.php?id='.$objp->fk_product.'">';
print img_object($langs->trans("ShowService"),"service").' '.$objp->ref.'</a>'; print img_object($langs->trans("ShowService"),"service").' '.$objp->ref.'</a>';
print $objp->label?' - '.$objp->label:''; print $objp->label?' - '.$objp->label:'';
if ($objp->description) print '<br />'.nl2br($objp->description); if ($objp->description) print '<br>'.nl2br($objp->description);
print '</td>'; print '</td>';
} }
else else
@ -985,7 +985,6 @@ else
*/ */
if ($_REQUEST["action"] == 'move' && ! $_REQUEST["cancel"] && $user->rights->contrat->creer && $contrat->lignes[$cursorline-1]->id == $_GET["rowid"]) if ($_REQUEST["action"] == 'move' && ! $_REQUEST["cancel"] && $user->rights->contrat->creer && $contrat->lignes[$cursorline-1]->id == $_GET["rowid"])
{ {
//print '<br />';
$arraycontractid=array(); $arraycontractid=array();
foreach($arrayothercontracts as $contractcursor) foreach($arrayothercontracts as $contractcursor)
{ {
@ -1006,7 +1005,6 @@ else
*/ */
if ($_REQUEST["action"] == 'active' && ! $_REQUEST["cancel"] && $user->rights->contrat->activer && $contrat->lignes[$cursorline-1]->id == $_GET["ligne"]) if ($_REQUEST["action"] == 'active' && ! $_REQUEST["cancel"] && $user->rights->contrat->activer && $contrat->lignes[$cursorline-1]->id == $_GET["ligne"])
{ {
//print '<br />';
$dateactstart = dol_mktime(12, 0 , 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]); $dateactstart = dol_mktime(12, 0 , 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
$dateactend = dol_mktime(12, 0 , 0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]); $dateactend = dol_mktime(12, 0 , 0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]);
$comment = $_POST["comment"]; $comment = $_POST["comment"];
@ -1019,7 +1017,6 @@ else
*/ */
if ($_REQUEST["action"] == 'closeline' && ! $_REQUEST["cancel"] && $user->rights->contrat->activer && $contrat->lignes[$cursorline-1]->id == $_GET["ligne"]) if ($_REQUEST["action"] == 'closeline' && ! $_REQUEST["cancel"] && $user->rights->contrat->activer && $contrat->lignes[$cursorline-1]->id == $_GET["ligne"])
{ {
//print '<br />';
$dateactstart = dol_mktime(12, 0 , 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]); $dateactstart = dol_mktime(12, 0 , 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]);
$dateactend = dol_mktime(12, 0 , 0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]); $dateactend = dol_mktime(12, 0 , 0, $_POST["endmonth"], $_POST["endday"], $_POST["endyear"]);
$comment = $_POST["comment"]; $comment = $_POST["comment"];

4
htdocs/core/photos_resize.php
View File

@ -107,8 +107,8 @@ print '<form name="redim_file" action="'.$_SERVER["PHP_SELF"].'?id='.$_GET['id']
print '<fieldset id="redim_file">'; print '<fieldset id="redim_file">';
print '<legend>'.$langs->trans("Resize").'</legend>'; print '<legend>'.$langs->trans("Resize").'</legend>';
print $langs->trans("ResizeDesc").'<br>'; print $langs->trans("ResizeDesc").'<br>';
print $langs->trans("NewLength").': <input class="flat" name="sizex" size="10" type="text" > px <br /> '; print $langs->trans("NewLength").': <input class="flat" name="sizex" size="10" type="text" > px <br> ';
print $langs->trans("NewHeight").': <input class="flat" name="sizey" size="10" type="text" > px &nbsp; <br />'; print $langs->trans("NewHeight").': <input class="flat" name="sizey" size="10" type="text" > px &nbsp; <br>';
print '<input type="hidden" name="file" value="'.$_GET['file'].'" />'; print '<input type="hidden" name="file" value="'.$_GET['file'].'" />';
print '<input type="hidden" name="action" value="confirm_resize" />'; print '<input type="hidden" name="action" value="confirm_resize" />';
print '<input type="hidden" name="product" value="'.$_GET['id'].'" />'; print '<input type="hidden" name="product" value="'.$_GET['id'].'" />';

10
htdocs/core/templates/passwordforgotten.tpl
View File

@ -128,22 +128,22 @@ function donnefocus() {ldelim}
</td></tr> </td></tr>
</table> </table>
<br /> <br>
{if $error_message} {if $error_message}
<table width="90%"><tr><td align="center" style="font-size: 12px;> <table width="90%"><tr><td align="center" style="font-size: 12px;>
{$error_message} {$error_message}
</td></tr></table><br /> </td></tr></table><br>
{/if} {/if}
<br /> <br>
<a href="{$dol_url_root}/"> <a href="{$dol_url_root}/">
{$langs->trans('BackToLoginPage')} {$langs->trans('BackToLoginPage')}
</a> </a>
</center> </center>
<br /> <br>
<br /> <br>
</body> </body>
</html> </html>

2
htdocs/expedition/index.php
View File

@ -53,7 +53,7 @@ print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchASending").'</td></tr>'; print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("SearchASending").'</td></tr>';
print '<tr '.$bc[$var].'><td>'; print '<tr '.$bc[$var].'><td>';
print $langs->trans("Ref").':</td><td><input type="text" class="flat" name="sf_ref" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>'; print $langs->trans("Ref").':</td><td><input type="text" class="flat" name="sf_ref" size="18"></td><td><input type="submit" value="'.$langs->trans("Search").'" class="button"></td></tr>';
print "</form></table><br />\n"; print "</form></table><br>\n";
/* /*
* Shipments to validate * Shipments to validate

2
htdocs/fichinter/fiche.php
View File

@ -784,7 +784,7 @@ elseif ($fichinterid)
print '</td>'; print '</td>';
print '<td align="center" colspan="5" valign="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">'; print '<td align="center" colspan="5" valign="center"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
print '<br /><input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></td>'; print '<br><input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'"></td>';
print '</tr>' . "\n"; print '</tr>' . "\n";
print "</form>\n"; print "</form>\n";

2
htdocs/fichinter/rapport.php
View File

@ -133,7 +133,7 @@ if ( $db->query($sql) )
} }
print "</table>"; print "</table>";
$db->free(); $db->free();
print "<br />".$langs->trans("Total")." $DureeTotal jour[s]"; print "<br>".$langs->trans("Total")." $DureeTotal jour[s]";
} }
else else
{ {

2
htdocs/fourn/commande/fiche.php
View File

@ -870,7 +870,7 @@ if ($id > 0 || ! empty($ref))
print '<td align="right"><input size="2" type="text" name="qty" value="'.$commandline->qty.'"></td>'; print '<td align="right"><input size="2" type="text" name="qty" value="'.$commandline->qty.'"></td>';
print '<td align="right" nowrap="nowrap"><input size="1" type="text" name="remise_percent" value="'.$commandline->remise_percent.'">%</td>'; print '<td align="right" nowrap="nowrap"><input size="1" type="text" name="remise_percent" value="'.$commandline->remise_percent.'">%</td>';
print '<td align="center" colspan="3"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">'; print '<td align="center" colspan="3"><input type="submit" class="button" name="save" value="'.$langs->trans("Save").'">';
print '<br /><input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'"></td>'; print '<br><input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'"></td>';
print '</tr>' . "\n"; print '</tr>' . "\n";
print "</form>\n"; print "</form>\n";
} }

2
htdocs/fourn/facture/fiche.php
View File

@ -999,7 +999,7 @@ else
print '<td align="right" nowrap="nowrap">&nbsp;</td>'; print '<td align="right" nowrap="nowrap">&nbsp;</td>';
print '<td align="center" colspan="2"><input type="submit" class="button" value="'.$langs->trans('Save').'">'; print '<td align="center" colspan="2"><input type="submit" class="button" value="'.$langs->trans('Save').'">';
print '<br /><input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'"></td>'; print '<br><input type="submit" class="button" name="cancel" value="'.$langs->trans('Cancel').'"></td>';
print '</tr>'; print '</tr>';
print '</form>'; print '</form>';

2
htdocs/fourn/product/fourn.php
View File

@ -171,7 +171,7 @@ if ($_GET["id"])
print '<form action="'.$action.'" method="post">'; print '<form action="'.$action.'" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="update">'; print '<input type="hidden" name="action" value="update">';
print '<br /><table class="border" width="100%">'; print '<br><table class="border" width="100%">';
print '<tr><td width="20%">'.$langs->trans("Price").'</td>'; print '<tr><td width="20%">'.$langs->trans("Price").'</td>';
print '<td><input name="price" size="20" value="'.$product->buyprice.'"></td></tr>'; print '<td><input name="price" size="20" value="'.$product->buyprice.'"></td></tr>';

4
htdocs/fourn/product/liste.php
View File

@ -169,8 +169,8 @@ if ($resql)
print "<div id='ways'>"; print "<div id='ways'>";
$c = new Categorie ($db, $catid); $c = new Categorie ($db, $catid);
$ways = $c->print_all_ways(' &gt; ','fourn/product/liste.php'); $ways = $c->print_all_ways(' &gt; ','fourn/product/liste.php');
print " &gt; ".$ways[0]."<br />\n"; print " &gt; ".$ways[0]."<br>\n";
print "</div><br />"; print "</div><br>";
} }

2
htdocs/fourn/product/photos.php
View File

@ -129,7 +129,7 @@ if ($_GET["id"])
print '<input type="submit" name="cancel" value="'.$langs->trans("Cancel").'"></td></tr>'; print '<input type="submit" name="cancel" value="'.$langs->trans("Cancel").'"></td></tr>';
print '</table>'; print '</table>';
print '</form><br />'; print '</form><br>';
} }

2
htdocs/index.php
View File

@ -78,7 +78,7 @@ if (file_exists(DOL_DOCUMENT_ROOT.'/logo.png'))
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
print '<tr><td colspan="3" style="text-align:center;">'; print '<tr><td colspan="3" style="text-align:center;">';
print '<img src="/logo.png"></td></tr>'; print '<img src="/logo.png"></td></tr>';
print "</table><br />\n"; print "</table><br>\n";
} }

16
htdocs/install/check.php
View File

@ -208,9 +208,9 @@ if (! file_exists($conffile))
{ {
//print '<img src="../theme/eldy/img/error.png" alt="Error"> '.$langs->trans("ConfFileDoesNotExistsAndCouldNotBeCreated",$conffile); //print '<img src="../theme/eldy/img/error.png" alt="Error"> '.$langs->trans("ConfFileDoesNotExistsAndCouldNotBeCreated",$conffile);
print '<img src="../theme/eldy/img/error.png" alt="Error"> '.$langs->trans("ConfFileDoesNotExistsAndCouldNotBeCreated",'conf.php'); print '<img src="../theme/eldy/img/error.png" alt="Error"> '.$langs->trans("ConfFileDoesNotExistsAndCouldNotBeCreated",'conf.php');
print "<br /><br />"; print "<br><br>";
print $langs->trans("YouMustCreateWithPermission",'htdocs/conf/conf.php'); print $langs->trans("YouMustCreateWithPermission",'htdocs/conf/conf.php');
print "<br /><br />"; print "<br><br>";
print $langs->trans("CorrectProblemAndReloadPage",$_SERVER['PHP_SELF'].'?testget=ok'); print $langs->trans("CorrectProblemAndReloadPage",$_SERVER['PHP_SELF'].'?testget=ok');
$err++; $err++;
@ -228,9 +228,9 @@ else
{ {
print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("ConfFileCouldBeCreated",'conf.php'); print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("ConfFileCouldBeCreated",'conf.php');
} }
print "<br />"; print "<br>";
print '<img src="../theme/eldy/img/tick.png" alt="Warning"> '.$langs->trans("ConfFileIsNotWritable",'htdocs/conf/conf.php'); print '<img src="../theme/eldy/img/tick.png" alt="Warning"> '.$langs->trans("ConfFileIsNotWritable",'htdocs/conf/conf.php');
print "<br />\n"; print "<br>\n";
$allowinstall=0; $allowinstall=0;
} }
@ -245,13 +245,13 @@ else
{ {
print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("ConfFileCouldBeCreated",'conf.php'); print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("ConfFileCouldBeCreated",'conf.php');
} }
print "<br />"; print "<br>";
print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("ConfFileIsWritable",'conf.php'); print '<img src="../theme/eldy/img/tick.png" alt="Ok"> '.$langs->trans("ConfFileIsWritable",'conf.php');
print "<br />\n"; print "<br>\n";
$allowinstall=1; $allowinstall=1;
} }
print "<br />\n"; print "<br>\n";
// Si prerequis ok, on affiche le bouton pour passer a l'etape suivante // Si prerequis ok, on affiche le bouton pour passer a l'etape suivante
if ($checksok) if ($checksok)
@ -305,7 +305,7 @@ else
print '<br>'; print '<br>';
print '<br>'; print '<br>';
} }
else print "<br />\n"; else print "<br>\n";
print $langs->trans("InstallEasy")." "; print $langs->trans("InstallEasy")." ";
print $langs->trans("ChooseYourSetupMode"); print $langs->trans("ChooseYourSetupMode");

2
htdocs/install/default.css
View File

@ -114,7 +114,7 @@ color: #550000; font-weight: bold;
} }
/* Next button */ /* Next button */
div.barrebottom { div.nextbutton {
text-align: right; text-align: right;
margin-top: 10px; margin-top: 10px;
padding-top: 5px; padding-top: 5px;

5
htdocs/install/etape1.php
View File

@ -481,9 +481,12 @@ function jsinfo()
{ {
ok=true; ok=true;
document.getElementById('nextbutton').style.display='hidden';
alert('<?php echo dol_escape_js($langs->transnoentities("NextStepMightLastALongTime")); ?>'); alert('<?php echo dol_escape_js($langs->transnoentities("NextStepMightLastALongTime")); ?>');
return ok;
//return ok;
return false;
} }
</script> </script>

2
htdocs/install/inc.php
View File

@ -312,7 +312,7 @@ function pFooter($nonext=0,$setuplang='',$jscheckfunction='')
if (! $nonext) if (! $nonext)
{ {
print '<div class="barrebottom"><input type="submit" value="'.$langs->trans("NextStep").' ->"'; print '<div class="nextbutton" id="nextbutton"><input type="submit" value="'.$langs->trans("NextStep").' ->"';
if ($jscheckfunction) print ' onClick="return '.$jscheckfunction.'();"'; if ($jscheckfunction) print ' onClick="return '.$jscheckfunction.'();"';
print '></div>'; print '></div>';
} }

8
htdocs/lib/images.lib.php
View File

@ -534,10 +534,10 @@ function moneyMeter($actualValue=0, $pendingValue=0, $intentValue=0)
$htmlLegenda = ' $htmlLegenda = '
<table cellpadding="0" cellspacing="0" border="0"> <table cellpadding="0" cellspacing="0" border="0">
<tr><td><img src="' . $imageColorActual . '" width="9" height="9">&nbsp;</td><td><font size="1" face="Verdana, Arial, Helvetica, sans-serif"><b>'.$langs->trans("Paid").':<br />' . $legendaActual . '</b></font></td></tr> <tr><td><img src="' . $imageColorActual . '" width="9" height="9">&nbsp;</td><td><font size="1" face="Verdana, Arial, Helvetica, sans-serif"><b>'.$langs->trans("Paid").':<br>' . $legendaActual . '</b></font></td></tr>
<tr><td><img src="' . $imageColorPending . '" width="9" height="9">&nbsp;</td><td><font size="1" face="Verdana, Arial, Helvetica, sans-serif">'.$langs->trans("Waiting").':<br />' . $legendaPending . '</font></td></tr> <tr><td><img src="' . $imageColorPending . '" width="9" height="9">&nbsp;</td><td><font size="1" face="Verdana, Arial, Helvetica, sans-serif">'.$langs->trans("Waiting").':<br>' . $legendaPending . '</font></td></tr>
<tr><td><img src="' . $imageColorIntent . '" width="9" height="9">&nbsp;</td><td><font size="1" face="Verdana, Arial, Helvetica, sans-serif">'.$langs->trans("Promesses").':<br />' . $legendaIntent . '</font></td></tr> <tr><td><img src="' . $imageColorIntent . '" width="9" height="9">&nbsp;</td><td><font size="1" face="Verdana, Arial, Helvetica, sans-serif">'.$langs->trans("Promesses").':<br>' . $legendaIntent . '</font></td></tr>
<tr><td>&nbsp;</td><td><font size="1" face="Verdana, Arial, Helvetica, sans-serif">Total:<br />' . $legendaTotal . '</font></td></tr> <tr><td>&nbsp;</td><td><font size="1" face="Verdana, Arial, Helvetica, sans-serif">Total:<br>' . $legendaTotal . '</font></td></tr>
</table> </table>
<!-- Thermometer End -->'; <!-- Thermometer End -->';

6
htdocs/product/liste.php
View File

@ -182,7 +182,7 @@ if ($resql)
// Displays product removal confirmation // Displays product removal confirmation
if (!empty($_GET['delprod'])) if (!empty($_GET['delprod']))
{ {
print '<div class="warning">'.$langs->trans("ProductDeleted",$_GET['delprod']).'</div><br />'; print '<div class="warning">'.$langs->trans("ProductDeleted",$_GET['delprod']).'</div><br>';
} }
$param="&amp;sref=".$sref.($sbarcode?"&amp;sbarcode=".$sbarcode:"")."&amp;snom=".$snom."&amp;sall=".$sall."&amp;envente=".$envente; $param="&amp;sref=".$sref.($sbarcode?"&amp;sbarcode=".$sbarcode:"")."&amp;snom=".$snom."&amp;sall=".$sall."&amp;envente=".$envente;
@ -195,8 +195,8 @@ if ($resql)
print "<div id='ways'>"; print "<div id='ways'>";
$c = new Categorie ($db, $catid); $c = new Categorie ($db, $catid);
$ways = $c->print_all_ways(' &gt; ','product/liste.php'); $ways = $c->print_all_ways(' &gt; ','product/liste.php');
print " &gt; ".$ways[0]."<br />\n"; print " &gt; ".$ways[0]."<br>\n";
print "</div><br />"; print "</div><br>";
} }
if ($conf->droitpret->enabled && isset($_GET["canvas"])) if ($conf->droitpret->enabled && isset($_GET["canvas"]))

4
htdocs/product/reassort.php
View File

@ -168,8 +168,8 @@ if ($resql)
print "<div id='ways'>"; print "<div id='ways'>";
$c = new Categorie ($db, $catid); $c = new Categorie ($db, $catid);
$ways = $c->print_all_ways(' &gt; ','product/reassort.php'); $ways = $c->print_all_ways(' &gt; ','product/reassort.php');
print " &gt; ".$ways[0]."<br />\n"; print " &gt; ".$ways[0]."<br>\n";
print "</div><br />"; print "</div><br>";
} }
print '<form action="reassort.php" method="post" name="formulaire">'; print '<form action="reassort.php" method="post" name="formulaire">';

2
htdocs/product/stock/fiche-valo.php
View File

@ -128,7 +128,7 @@ if ($_GET["id"])
if (file_exists(DOL_DATA_ROOT.'/entrepot/temp/entrepot-'.$entrepot->id.'-'.($year-1).'.png')) if (file_exists(DOL_DATA_ROOT.'/entrepot/temp/entrepot-'.$entrepot->id.'-'.($year-1).'.png'))
{ {
$url=DOL_URL_ROOT.'/viewimage.php?modulepart=graph_stock&amp;file=entrepot-'.$entrepot->id.'-'.($year-1).'.png'; $url=DOL_URL_ROOT.'/viewimage.php?modulepart=graph_stock&amp;file=entrepot-'.$entrepot->id.'-'.($year-1).'.png';
print '<br /><img src="'.$url.'" alt="Valorisation du stock annee '.($year-1).'">'; print '<br><img src="'.$url.'" alt="Valorisation du stock annee '.($year-1).'">';
} }
} }
else else

6
htdocs/product/stock/valo.php
View File

@ -125,20 +125,20 @@ if ($result)
$db->free($result); $db->free($result);
print "</table>"; print "</table>";
print '<br />'; print '<br>';
$file='entrepot-'.$year.'.png'; $file='entrepot-'.$year.'.png';
if (file_exists(DOL_DATA_ROOT.'/entrepot/temp/'.$file)) if (file_exists(DOL_DATA_ROOT.'/entrepot/temp/'.$file))
{ {
$url=DOL_URL_ROOT.'/viewimage.php?modulepart=graph_stock&amp;file='.$file; $url=DOL_URL_ROOT.'/viewimage.php?modulepart=graph_stock&amp;file='.$file;
print '<img src="'.$url.'" alt="Valorisation du stock ann<6E>e '.($year).'">'; print '<img src="'.$url.'">';
} }
$file='entrepot-'.($year-1).'.png'; $file='entrepot-'.($year-1).'.png';
if (file_exists(DOL_DATA_ROOT.'/entrepot/temp/'.$file)) if (file_exists(DOL_DATA_ROOT.'/entrepot/temp/'.$file))
{ {
$url=DOL_URL_ROOT.'/viewimage.php?modulepart=graph_stock&amp;file='.$file; $url=DOL_URL_ROOT.'/viewimage.php?modulepart=graph_stock&amp;file='.$file;
print '<br /><img src="'.$url.'" alt="Valorisation du stock ann<6E>e '.($year-1).'">'; print '<br><img src="'.$url.'">';
} }
} }

6
htdocs/product/templates/livre/livre-create.tpl
View File

@ -127,7 +127,7 @@
</tr> </tr>
</table> </table>
<br /> <br>
<table class="border" width="100%"> <table class="border" width="100%">
<tr> <tr>
@ -159,7 +159,7 @@
</tr> </tr>
</table> </table>
<br /> <br>
<table class="border" width="100%"> <table class="border" width="100%">
<tr> <tr>
@ -198,7 +198,7 @@
</tr> </tr>
</table> </table>
<br /> <br>
<table class="border" width="100%"> <table class="border" width="100%">
<tr> <tr>

8
htdocs/product/templates/livre/livre-edit.tpl
View File

@ -122,7 +122,7 @@
</tr> </tr>
</table> </table>
<br /> <br>
<table class="border" width="100%"> <table class="border" width="100%">
<tr> <tr>
@ -137,7 +137,7 @@
</tr> </tr>
</table> </table>
<br /> <br>
<table class="border" width="100%"> <table class="border" width="100%">
<tr> <tr>
@ -167,7 +167,7 @@
</tr> </tr>
</table> </table>
<br /> <br>
<table class="border" width="100%"> <table class="border" width="100%">
@ -235,7 +235,7 @@
</table> </table>
<br /> <br>
<table class="border" width="100%"> <table class="border" width="100%">

2
htdocs/product/templates/livre/livre-view.tpl
View File

@ -138,7 +138,7 @@
</table> </table>
<br /> <br>
<table class="border" width="100%"> <table class="border" width="100%">

6
htdocs/product/templates/livrecontrat/livrecontrat-edit.tpl
View File

@ -41,7 +41,7 @@
</table> </table>
<br /> <br>
<table class="border" width="100%"> <table class="border" width="100%">
<tr> <tr>
@ -55,7 +55,7 @@
</tr> </tr>
</table> </table>
<br /> <br>
<table class="border" width="100%"> <table class="border" width="100%">
<tr> <tr>
@ -82,7 +82,7 @@
</tr> </tr>
</table> </table>
<br /> <br>
<table class="border" width="100%"> <table class="border" width="100%">
<tr> <tr>

4
htdocs/product/templates/livrecontrat/livrecontrat-view.tpl
View File

@ -56,7 +56,7 @@
</table> </table>
<br /> <br>
<table class="border" width="100%"> <table class="border" width="100%">
@ -76,7 +76,7 @@
</table> </table>
<br /> <br>
<table class="border" width="100%"> <table class="border" width="100%">

6
htdocs/product/templates/livrecouverture/livrecouverture-edit.tpl
View File

@ -99,7 +99,7 @@
</tr> </tr>
</table> </table>
<br /> <br>
<table class="border" width="100%"> <table class="border" width="100%">
<tr> <tr>
@ -116,7 +116,7 @@
</tr> </tr>
</table> </table>
<br /> <br>
<table class="border" width="100%"> <table class="border" width="100%">
<tr> <tr>
@ -147,7 +147,7 @@
</tr> </tr>
</table> </table>
<br /> <br>
<table class="border" width="100%"> <table class="border" width="100%">
<tr> <tr>

4
htdocs/product/templates/livrecouverture/livrecouverture-view.tpl
View File

@ -34,7 +34,7 @@
</tr> </tr>
</table> </table>
<br /> <br>
<table class="border" width="100%"> <table class="border" width="100%">
@ -54,6 +54,6 @@
</table> </table>
<br /> <br>
<!-- END SMARTY TEMPLATE --> <!-- END SMARTY TEMPLATE -->

6
htdocs/projet/activity/index.php
View File

@ -124,7 +124,7 @@ print "</tr>\n";
print "</table>"; print "</table>";
/* Affichage de la liste des projets d'hier */ /* Affichage de la liste des projets d'hier */
print '<br /><table class="noborder" width="100%">'; print '<br><table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans('Yesterday').'</td>'; print '<td>'.$langs->trans('Yesterday').'</td>';
print '<td align="right">'.$langs->trans("Time").'</td>'; print '<td align="right">'.$langs->trans("Time").'</td>';
@ -223,7 +223,7 @@ print '<tr class="liste_total">';
print '<td>'.$langs->trans('Total').'</td>'; print '<td>'.$langs->trans('Total').'</td>';
print '<td align="right">'.$total.'</td>'; print '<td align="right">'.$total.'</td>';
print "</tr>\n"; print "</tr>\n";
print "</table><br />"; print "</table><br>";
/* Affichage de la liste des projets du mois */ /* Affichage de la liste des projets du mois */
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';
@ -269,7 +269,7 @@ else
print "</table>"; print "</table>";
/* Affichage de la liste des projets de l'annee */ /* Affichage de la liste des projets de l'annee */
print '<br /><table class="noborder" width="100%">'; print '<br><table class="noborder" width="100%">';
print '<tr class="liste_titre">'; print '<tr class="liste_titre">';
print '<td>'.$langs->trans("ActivityOnProjectThisYear").': '.strftime("%Y", $now).'</td>'; print '<td>'.$langs->trans("ActivityOnProjectThisYear").': '.strftime("%Y", $now).'</td>';
print '<td align="right">'.$langs->trans("Time").'</td>'; print '<td align="right">'.$langs->trans("Time").'</td>';

2
htdocs/theme/phones/iphone/templates/login.tpl
View File

@ -53,7 +53,7 @@
<img src="{$dol_url_root}/theme/phones/iphone/theme/{$theme}/thumbs/dolibarr.png"> <img src="{$dol_url_root}/theme/phones/iphone/theme/{$theme}/thumbs/dolibarr.png">
</div> </div>
<br /> <br>
<span class="graytitle">{$langs->trans('Identification')}</span> <span class="graytitle">{$langs->trans('Identification')}</span>
<ul class="pageitem"> <ul class="pageitem">

2
htdocs/theme/phones/iphone/templates/user/passwordforgotten.tpl
View File

@ -57,7 +57,7 @@
<img src="{$dol_url_root}/theme/phones/iphone/theme/{$theme}/thumbs/dolibarr.png"> <img src="{$dol_url_root}/theme/phones/iphone/theme/{$theme}/thumbs/dolibarr.png">
</div> </div>
<br /> <br>
<span class="graytitle">{$langs->trans('Identification')}</span> <span class="graytitle">{$langs->trans('Identification')}</span>
<ul class="pageitem"> <ul class="pageitem">