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

Fix: Pb balises mal fermes

Browse Source
This commit is contained in:
Laurent Destailleur 2005-09-29 19:30:59 +00:00
parent 8565116184
commit dfa2d60d96
2 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/contrat/fiche.php
View File

@ -808,13 +808,15 @@ else
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td colspan="3">'; print '<td colspan="3">';
$html->select_produits('','p_idprod','',0).'<br>'; $html->select_produits('','p_idprod','',0);
print '<textarea name="desc" cols="50" rows="1"></textarea>'; print '<br>';
print '<textarea name="desc" cols="50" rows="'.ROWS_2.'"></textarea>';
print '</td>'; print '</td>';
print '<td align="center"><input type="text" class="flat" size="2" name="pqty" value="1"></td>'; print '<td align="center"><input type="text" class="flat" size="2" name="pqty" value="1"></td>';
print '<td align="right" nowrap><input type="text" class="flat" size="1" name="premise" value="0">%</td>'; print '<td align="right" nowrap><input type="text" class="flat" size="1" name="premise" value="0">%</td>';
print '<td align="center" colspan="3" rowspan="2"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>'; print '<td align="center" colspan="2" rowspan="2"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
print '</tr>'."\n";
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td colspan="8">'; print '<td colspan="8">';
@ -836,7 +838,7 @@ else
print '<input type="hidden" name="id" value="'.$id.'">'; print '<input type="hidden" name="id" value="'.$id.'">';
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td><textarea name="desc" cols="50" rows="1"></textarea></td>'; print '<td><textarea name="desc" cols="50" rows="'.ROWS_2.'"></textarea></td>';
print '<td>'; print '<td>';
$html->select_tva("tva_tx",$conf->defaulttx); $html->select_tva("tva_tx",$conf->defaulttx);
@ -844,7 +846,7 @@ else
print '<td align="right"><input type="text" class="flat" size="4" name="pu" value=""></td>'; print '<td align="right"><input type="text" class="flat" size="4" name="pu" value=""></td>';
print '<td align="center"><input type="text" class="flat" size="2" name="pqty" value="1"></td>'; print '<td align="center"><input type="text" class="flat" size="2" name="pqty" value="1"></td>';
print '<td align="right" nowrap><input type="text" class="flat" size="1" name="premise" value="0">%</td>'; print '<td align="right" nowrap><input type="text" class="flat" size="1" name="premise" value="0">%</td>';
print '<td align="center" colspan="2" rowspan="2"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>'; print '<td align="center" rowspan="2" colspan="2"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td>';
print '</tr>'."\n"; print '</tr>'."\n";

15
htdocs/main.inc.php
View File

@ -31,6 +31,7 @@
require("master.inc.php"); require("master.inc.php");
// Verification du login. // Verification du login.
// Cette verification est faite pour chaque accès. Après l'authentification, // Cette verification est faite pour chaque accès. Après l'authentification,
// l'objet $user est initialisée. Notament $user->id, $user->login et $user->nom, $user->prenom // l'objet $user est initialisée. Notament $user->id, $user->login et $user->nom, $user->prenom
@ -177,6 +178,20 @@ if (defined("MAIN_NOT_INSTALLED"))
Header("Location: ".DOL_URL_ROOT."/install/index.php"); Header("Location: ".DOL_URL_ROOT."/install/index.php");
} }
// Constantes utilisées pour définir le nombre de lignes des textarea
if (! eregi("firefox",$_SERVER["HTTP_USER_AGENT"]))
{
define('ROWS_1',1);
define('ROWS_2',2);
define('ROWS_3',3);
}
else
{
define('ROWS_1',0);
define('ROWS_2',1);
define('ROWS_3',2);
}
/** /**