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

Nouvelle forme de la liste

Browse Source
This commit is contained in:
Rodolphe Quiedeville 2003-04-13 18:58:30 +00:00
parent ae103a2d0a
commit 5642217a45
1 changed files with 26 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
htdocs/compta/facture.php3
View File

@ -227,7 +227,7 @@ if ($action == 'create')
print "<tr bgcolor=\"#e0e0e0\"><td>Client :</td><td>$obj->nom</td>"; print "<tr bgcolor=\"#e0e0e0\"><td>Client :</td><td>$obj->nom</td>";
print '<td rowspan="6">'; print '<td rowspan="4">';
print '<textarea name="note" wrap="soft" cols="60" rows="15"></textarea></td></tr>'; print '<textarea name="note" wrap="soft" cols="60" rows="15"></textarea></td></tr>';
if ($propalid) if ($propalid)
@ -246,13 +246,7 @@ if ($action == 'create')
} }
else else
{ {
print '<tr bgcolor="#e0e0e0"><td>Montant HT :</td><td>';
print '<input name="amount" type="text" value=""></td></tr>';
print '</td></tr>';
print '<tr bgcolor="#e0e0e0"><td>Remise :</td><td>';
print '<input name="remise" type="text" value=""></td></tr>';
print '</td></tr>';
} }
print "<input type=\"hidden\" name=\"author\" value=\"$author\">"; print "<input type=\"hidden\" name=\"author\" value=\"$author\">";
@ -742,7 +736,7 @@ else
$sql .= " AND date_format(f.datef, '%Y') = $year"; $sql .= " AND date_format(f.datef, '%Y') = $year";
} }
$sql .= " ORDER BY f.fk_statut, f.paye, f.datef DESC, f.facnumber DESC "; $sql .= " ORDER BY f.datef DESC, f.facnumber DESC ";
$result = $db->query($sql); $result = $db->query($sql);
if ($result) { if ($result) {
@ -754,7 +748,7 @@ else
print "<TD>Num&eacute;ro</TD><td>"; print "<TD>Num&eacute;ro</TD><td>";
print_liste_field_titre("Société",$PHP_SELF,"s.nom"); print_liste_field_titre("Société",$PHP_SELF,"s.nom");
print "</td><TD align=\"right\">Date</TD><TD align=\"right\">Montant</TD>"; print "</td><TD align=\"right\">Date</TD><TD align=\"right\">Montant</TD>";
print '<td>&nbsp;</td>';
print "</TR>\n"; print "</TR>\n";
if ($num > 0) { if ($num > 0) {
@ -763,27 +757,16 @@ else
$objp = $db->fetch_object( $i); $objp = $db->fetch_object( $i);
$var=!$var; $var=!$var;
if ($objp->paye && !$sep) {
print "<tr><td colspan=\"3\" align=\"right\">";
print "&nbsp;</small></td>";
print "<td align=\"right\">Sous Total :<b> ".price($total)."</b></td></tr>";
print '<TR class="liste_titre">';
print "<TD>Num&eacute;ro</TD><td>";
print_liste_field_titre("Société",$PHP_SELF,"s.nom");
print "</td><TD align=\"right\">Date</TD><TD align=\"right\">Montant</TD>";
$sep = 1 ; $j = 0;
$subtotal = 0;
}
print "<TR $bc[$var]>"; print "<TR $bc[$var]>";
print "<td><a href=\"facture.php3?facid=$objp->facid\">"; print "<td><a href=\"facture.php3?facid=$objp->facid\">";
if ($objp->paye) { if ($objp->paye)
print $objp->facnumber; {
} else { print $objp->facnumber;
print '<b>'.$objp->facnumber.'</b>'; }
} else
{
print '<b>'.$objp->facnumber.'</b>';
}
print "</a></TD>\n"; print "</a></TD>\n";
print "<TD><a href=\"fiche.php3?socid=$objp->idp\">$objp->nom</a></TD>\n"; print "<TD><a href=\"fiche.php3?socid=$objp->idp\">$objp->nom</a></TD>\n";
@ -803,6 +786,15 @@ else
print "<TD align=\"right\">".price($objp->amount)."</TD>\n"; print "<TD align=\"right\">".price($objp->amount)."</TD>\n";
if (! $objp->paye)
{
print '<td align="center">impayée</td>';
}
else
{
print '<td>&nbsp;</td>';
}
$total = $total + $objp->amount; $total = $total + $objp->amount;
$subtotal = $subtotal + $objp->amount; $subtotal = $subtotal + $objp->amount;
@ -815,11 +807,11 @@ else
} }
if ($i == 0) { $i=1; } if ($j == 0) { $j=1; } if ($i == 0) { $i=1; } if ($j == 0) { $j=1; }
print "<tr><td></td><td>$j factures</td><td colspan=\"1\" align=\"right\">&nbsp;</td>"; print "<tr><td></td><td>$j factures</td><td colspan=\"1\" align=\"right\">&nbsp;</td>";
print "<td align=\"right\">Sous Total :<b> ".price($subtotal)."</b></td></tr>"; print "<td align=\"right\">Sous Total :<b> ".price($subtotal)."</b></td>";
print '<td>&nbsp;</td></tr>';
print "<tr bgcolor=\"#d0d0d0\"><td></td><td>$i factures</td><td colspan=\"1\" align=\"right\">&nbsp;</td>"; print "<tr bgcolor=\"#d0d0d0\"><td></td><td>$i factures</td><td colspan=\"1\" align=\"right\">&nbsp;</td>";
print "<td align=\"right\"><b>Total <small>(euros HT)</small>: ".price($total)."</b></td></tr>"; print "<td align=\"right\"><b>Total <small>(euros HT)</small>: ".price($total)."</b></td>";
print '<td>&nbsp;</td></tr>';
print "</TABLE>"; print "</TABLE>";
$db->free(); $db->free();
} else { } else {