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

Look: Modif esthtiques mineures

Browse Source
This commit is contained in:
Laurent Destailleur 2005-07-15 00:49:05 +00:00
parent fdf617a4c2
commit a2a4da061a
2 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
htdocs/comm/index.php
View File

@ -156,7 +156,7 @@ if ($conf->propal->enabled && $user->rights->propale->lire)
/*
* Commandes à valider
* Commandes brouillons
*/
if ($conf->commande->enabled)
{
@ -165,28 +165,28 @@ if ($conf->commande->enabled)
$sql .= " WHERE c.fk_soc = s.idp AND c.fk_statut = 0";
if ($socidp)
{
$sql .= " AND c.fk_soc = $socidp";
$sql .= " AND c.fk_soc = $socidp";
}
if ( $db->query($sql) )
if ( $db->query($sql) )
{
$num = $db->num_rows();
if ($num)
$num = $db->num_rows();
if ($num)
{
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td colspan="2">'.$langs->trans("OrdersToValid").'</td></tr>';
$i = 0;
$var = False;
while ($i < $num)
{
$obj = $db->fetch_object();
print "<tr $bc[$var]><td width=\"25%\" nowrap><a href=\"../commande/fiche.php?id=$obj->rowid\">".img_object($langs->trans("ShowOrder"),"order")." ".$obj->ref."</a></td>";
print '<td><a href="fiche.php?socid='.$obj->idp.'">'.$obj->nom.'</a></td></tr>';
$i++;
$var=!$var;
}
print "</table><br>";
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre">';
print '<td colspan="2">'.$langs->trans("DraftOrders").'</td></tr>';
$i = 0;
$var = true;
while ($i < $num)
{
$var=!$var;
$obj = $db->fetch_object();
print "<tr $bc[$var]><td nowrap><a href=\"../commande/fiche.php?id=$obj->rowid\">".img_object($langs->trans("ShowOrder"),"order")." ".$obj->ref."</a></td>";
print '<td><a href="fiche.php?socid='.$obj->idp.'">'.dolibarr_trunc($obj->nom,24).'</a></td></tr>';
$i++;
}
print "</table><br>";
}
}
}

14
htdocs/commande/fiche.php
View File

@ -333,7 +333,7 @@ if ($_GET["action"] == 'create' && $user->rights->commande->creer)
{
print '<tr><td><select name="idprod'.$i.'">'.$opt.'</select></td>';
print '<td><input type="text" size="3" name="qty'.$i.'" value="1"></td>';
print '<td><input type="text" size="4" name="remise_percent'.$i.'" value="0"> %</td></tr>';
print '<td><input type="text" size="3" name="remise_percent'.$i.'" value="0">%</td></tr>';
}
print '</table>';
@ -375,7 +375,7 @@ if ($_GET["action"] == 'create' && $user->rights->commande->creer)
print "<tr $bc[$var]><td>[$objp->ref]</td>\n";
print '<td>'.img_object($langs->trans("ShowProduct"),"product").' '.$objp->product.'</td>';
print "<td align=\"right\">".price($objp->price)."</td>";
print '<td align="center">'.$objp->remise_percent.' %</td>';
print '<td align="center">'.$objp->remise_percent.'%</td>';
print "<td align=\"center\">".$objp->qty."</td></tr>\n";
$i++;
}
@ -395,14 +395,14 @@ if ($_GET["action"] == 'create' && $user->rights->commande->creer)
print "<tr $bc[$var]><td>&nbsp;</td>\n";
print '<td>'.img_object($langs->trans("ShowProduct"),"product").' '.$objp->product.'</td>';
print '<td align="right">'.price($objp->price).'</td>';
print '<td align="center">'.$objp->remise_percent.' %</td>';
print '<td align="center">'.$objp->remise_percent.'%</td>';
print "<td align=\"center\">".$objp->qty."</td></tr>\n";
$i++;
}
}
else
{
print $sql;
dolibarr_print_error($db);
}
print '</table>';
@ -730,15 +730,15 @@ else
print $html->select_tva("tva_tx",$conf->defaulttx);
print '</td>';
print '<td align="center"><input type="text" name="qty" value="1" size="2"></td>';
print '<td align="right"><input type="text" name="remise_percent" size="3" value="0">%</td>';
print '<td align="right"><input type="text" name="pu" size="7"></td>';
print '<td align="right" nowrap><input type="text" name="remise_percent" size="2" value="0">%</td>';
print '<td align="right"><input type="text" name="pu" size="6"></td>';
print '<td align="center" colspan="3"><input type="submit" value="'.$langs->trans("Add").'"></td></tr>';
$var=!$var;
print "<tr $bc[$var]><td colspan=\"2\"><select name=\"p_idprod\">$opt</select></td>";
print '<td align="center"><input type="text" size="2" name="pqty" value="1"></td>';
print '<td align="right"><input type="text" size="3" name="premise" value="0">%</td>';
print '<td align="right" nowrap><input type="text" size="2" name="premise" value="0">%</td>';
print '<td>&nbsp;</td>';
print '<td align="center" colspan="3"><input type="submit" value="'.$langs->trans("Add").'"></td></tr>';
print "</tr>\n";