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

Modifications esthtiques mineures

Browse Source
This commit is contained in:
Laurent Destailleur 2005-04-22 23:47:25 +00:00
parent 7c467f6761
commit b5d0591f46
1 changed files with 160 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
htdocs/compta/facture.php
View File

@ -641,7 +641,7 @@ if ($_GET["action"] == 'create')
{ {
print '<tr><td><select class="flat" name="idprod'.$i.'">'.$opt.'</select></td>'; print '<tr><td><select class="flat" 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="3" name="qty'.$i.'" value="1"></td>';
print '<td><input type="text" size="4" name="remise_percent'.$i.'" value="0"> %</td>'; print '<td><input type="text" size="4" name="remise_percent'.$i.'" value="0">%</td>';
print '<td>&nbsp;</td>'; print '<td>&nbsp;</td>';
// Si le module service est actif, on propose des dates de début et fin à la ligne // Si le module service est actif, on propose des dates de début et fin à la ligne
if ($conf->service->enabled) { if ($conf->service->enabled) {
@ -724,7 +724,7 @@ if ($_GET["action"] == 'create')
print "<tr $bc[$var]><td>[$objp->ref]</td>\n"; print "<tr $bc[$var]><td>[$objp->ref]</td>\n";
print '<td>'.$objp->product.'</td>'; print '<td>'.$objp->product.'</td>';
print "<td align=\"right\">".price($objp->price)."</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"; print "<td align=\"center\">".$objp->qty."</td></tr>\n";
$i++; $i++;
} }
@ -745,7 +745,7 @@ if ($_GET["action"] == 'create')
print "<tr $bc[$var]><td>&nbsp;</td>\n"; print "<tr $bc[$var]><td>&nbsp;</td>\n";
print '<td>'.$objp->product.'</td>'; print '<td>'.$objp->product.'</td>';
print '<td align="right">'.price($objp->price).'</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"; print "<td align=\"center\">".$objp->qty."</td></tr>\n";
$i++; $i++;
} }
@ -788,7 +788,7 @@ if ($_GET["action"] == 'create')
print "<tr $bc[$var]><td>[$objp->ref]</td>\n"; print "<tr $bc[$var]><td>[$objp->ref]</td>\n";
print '<td>'.$objp->product.'</td>'; print '<td>'.$objp->product.'</td>';
print '<td align="right">'.price($objp->subprice).'</td>'; print '<td align="right">'.price($objp->subprice).'</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>'; print '<td align="center">'.$objp->qty.'</td></tr>';
$i++; $i++;
} }
@ -987,11 +987,11 @@ else
print '<form action="facture.php?facid='.$fac->id.'" method="post">'; print '<form action="facture.php?facid='.$fac->id.'" method="post">';
print '<input type="hidden" name="action" value="setremise">'; print '<input type="hidden" name="action" value="setremise">';
print '<td colspan="3"><input type="text" name="remise" size="3" value="'.$fac->remise_percent.'">% '; print '<td colspan="3"><input type="text" name="remise" size="3" value="'.$fac->remise_percent.'">% ';
print '<input type="submit" value="'.$langs->trans("Modify").'"></td>'; print '<input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
print '</form>'; print '</form>';
} }
else { else {
print '<td colspan="3">'.$fac->remise_percent.' %</td>'; print '<td colspan="3">'.$fac->remise_percent.'%</td>';
} }
print '</tr>'; print '</tr>';
@ -1054,6 +1054,11 @@ else
{ {
$objp = $db->fetch_object($resql); $objp = $db->fetch_object($resql);
$var=!$var; $var=!$var;
// Update ligne de facture
if ($_GET["action"] != 'editline' || $_GET["rowid"] != $objp->rowid)
{
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
if ($objp->fk_product > 0) if ($objp->fk_product > 0)
{ {
@ -1080,7 +1085,7 @@ else
print '<td align="right">'.$objp->qty.'</td>'; print '<td align="right">'.$objp->qty.'</td>';
if ($objp->remise_percent > 0) if ($objp->remise_percent > 0)
{ {
print '<td align="right">'.$objp->remise_percent." %</td>\n"; print '<td align="right">'.$objp->remise_percent."%</td>\n";
} }
else else
{ {
@ -1098,13 +1103,19 @@ else
print img_delete(); print img_delete();
print '</a></td>'; print '</a></td>';
print '<td align="right">'; print '<td align="right" height="28">';
if ($i > 0)
{
print '<a href="facture.php?facid='.$fac->id.'&amp;action=up&amp;rowid='.$objp->rowid.'">'; print '<a href="facture.php?facid='.$fac->id.'&amp;action=up&amp;rowid='.$objp->rowid.'">';
print img_up(); print img_up();
print '</a><a href="facture.php?facid='.$fac->id.'&amp;action=down&amp;rowid='.$objp->rowid.'">'; print '</a>';
}
if ($i < $num_lignes-1)
{
print '<a href="facture.php?facid='.$fac->id.'&amp;action=down&amp;rowid='.$objp->rowid.'">';
print img_down(); print img_down();
print '</a></td>'; print '</a></td>';
}
} }
else else
{ {
@ -1112,6 +1123,8 @@ else
} }
print "</tr>"; print "</tr>";
}
// Update ligne de facture // Update ligne de facture
if ($_GET["action"] == 'editline' && $_GET["rowid"] == $objp->rowid) if ($_GET["action"] == 'editline' && $_GET["rowid"] == $objp->rowid)
{ {
@ -1123,17 +1136,18 @@ else
print '<td><textarea name="desc" cols="50" rows="2">'.stripslashes($objp->description).'</textarea></td>'; print '<td><textarea name="desc" cols="50" rows="2">'.stripslashes($objp->description).'</textarea></td>';
print '<td align="right">'; print '<td align="right">';
//print $html->select_tva("tva_tx",$objp->tva_taux); //print $html->select_tva("tva_tx",$objp->tva_taux);
print "$objp->tva_taux %"; // Taux tva dépend du produit, donc on ne doit pas pouvoir le changer ici print $objp->tva_taux."%"; // Taux tva dépend du produit, donc on ne doit pas pouvoir le changer ici
print '</td>'; print '</td>';
print '<td align="right"><input size="8" type="text" name="price" value="'.price($objp->subprice).'"></td>'; print '<td align="right"><input size="8" type="text" name="price" value="'.price($objp->subprice).'"></td>';
print '<td align="right"><input size="4" type="text" name="qty" value="'.$objp->qty.'"></td>'; print '<td align="right"><input size="4" type="text" name="qty" value="'.$objp->qty.'"></td>';
print '<td align="right"><input size="3" type="text" name="remise_percent" value="'.$objp->remise_percent.'">&nbsp;%</td>'; print '<td align="right"><input size="3" type="text" name="remise_percent" value="'.$objp->remise_percent.'">%</td>';
print '<td align="center" colspan="4"><input type="submit" name="save" value="'.$langs->trans("Save").'"><br /><input type="submit" name="cancel" value="'.$langs->trans("Cancel").'"></td>'; print '<td align="center" rowspan="2" colspan="4" 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 '</tr>' . "\n"; print '</tr>' . "\n";
if ($conf->service->enabled) if ($conf->service->enabled)
{ {
print "<tr $bc[$var]>"; print "<tr $bc[$var]>";
print '<td colspan="9">Si produit de type service à durée limitée: Du '; print '<td colspan="5">Si produit de type service à durée limitée: Du ';
print $html->select_date($objp->date_start,"date_start",0,0,$objp->date_start?0:1); print $html->select_date($objp->date_start,"date_start",0,0,$objp->date_start?0:1);
print ' au '; print ' au ';
print $html->select_date($objp->date_end,"date_end",0,0,$objp->date_end?0:1); print $html->select_date($objp->date_end,"date_end",0,0,$objp->date_end?0:1);
@ -1158,7 +1172,7 @@ else
* Ajouter une ligne * Ajouter une ligne
* *
*/ */
if ($fac->statut == 0 && $user->rights->facture->creer && $_GET["action"] <> 'editline' && $_GET["action"] <> 'valid') if ($fac->statut == 0 && $user->rights->facture->creer && $_GET["action"] <> 'valid')
{ {
print "<form action=\"".$_SERVER["PHP_SELF"]."\" method=\"post\">"; print "<form action=\"".$_SERVER["PHP_SELF"]."\" method=\"post\">";
@ -1183,13 +1197,13 @@ else
print '<td align="right">'; print '<td align="right">';
print $html->select_tva("tva_tx",$conf->defaulttx); print $html->select_tva("tva_tx",$conf->defaulttx);
print '</td>'; print '</td>';
print '<td align="right"><input type="text" name="pu" size="8"></td>'; print '<td align="right"><input type="text" name="pu" size="6"></td>';
print '<td align="right"><input type="text" name="qty" value="1" size="2"></td>'; print '<td align="right"><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" nowrap><input type="text" name="remise_percent" size="2" value="0">%</td>';
print '<td align="center" colspan="4"><input type="submit" value="'.$langs->trans("Add").'"></td></tr>'; print '<td align="center" valign="middle" rowspan="2" colspan="4"><input type="submit" class="button" value="'.$langs->trans("Add").'"></td></tr>';
if ($conf->service->enabled) { if ($conf->service->enabled) {
print '<tr '.$bc[$var].'>'; print '<tr '.$bc[$var].'>';
print '<td colspan="9">Si produit de type service à durée limitée: Du '; print '<td colspan="5">Si produit de type service à durée limitée: Du ';
print $html->select_date('',"date_start",0,0,1); print $html->select_date('',"date_start",0,0,1);
print ' au '; print ' au ';
print $html->select_date('',"date_end",0,0,1); print $html->select_date('',"date_end",0,0,1);