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

Modif pour register_globals=off

Browse Source
This commit is contained in:
Rodolphe Quiedeville 2004-07-13 12:45:37 +00:00
parent 5b5eae3129
commit 8d7976d24d
1 changed files with 137 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,7 @@ $mesg='';
$action=isset($_GET["action"])?$_GET["action"]:$_POST["action"]; $action=isset($_GET["action"])?$_GET["action"]:$_POST["action"];
if ($action == 'valid') if ($_GET["action"] == 'valid')
{ {
$facturefourn=new FactureFourn($db); $facturefourn=new FactureFourn($db);
$facturefourn->fetch($_GET["facid"]); $facturefourn->fetch($_GET["facid"]);
@ -47,7 +47,7 @@ if ($action == 'valid')
$facturefourn->set_valid($user->id); $facturefourn->set_valid($user->id);
} }
if ($action == 'payed') if ($_GET["action"] == 'payed')
{ {
$facturefourn=new FactureFourn($db); $facturefourn=new FactureFourn($db);
$facturefourn->fetch($_GET["facid"]); $facturefourn->fetch($_GET["facid"]);
@ -73,7 +73,7 @@ if ($_POST["action"] == 'modif_libelle')
} }
if ($action == 'update') if ($_POST["action"] == 'update')
{ {
$datefacture = $db->idate(mktime(12, 0 , 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"])); $datefacture = $db->idate(mktime(12, 0 , 0, $_POST["remonth"], $_POST["reday"], $_POST["reyear"]));
@ -86,15 +86,16 @@ if ($action == 'update')
$result = $db->query( $sql); $result = $db->query( $sql);
} }
if ($action == 'add') if ($_POST["action"] == 'add')
{ {
if ($_POST["facnumber"]) { if ($_POST["facnumber"])
{
$datefacture = $db->idate(mktime(12, $datefacture = $db->idate(mktime(12,
0, 0,
0, 0,
$_POST["remonth"], $_POST["remonth"],
$_POST["reday"], $_POST["reday"],
$_POST["reyear"])); $_POST["reyear"]));
$tva = 0; $tva = 0;
$tva = ($_POST["tva_taux"] * $_POST["amount"]) / 100 ; $tva = ($_POST["tva_taux"] * $_POST["amount"]) / 100 ;
$remise = 0; $remise = 0;
@ -114,7 +115,8 @@ if ($action == 'add')
$facid = $facfou->create($user); $facid = $facfou->create($user);
// Ajout des lignes de factures // Ajout des lignes de factures
if ($facid > 0) { if ($facid > 0)
{
for ($i = 1 ; $i < 9 ; $i++) for ($i = 1 ; $i < 9 ; $i++)
{ {
$label = "label$i"; $label = "label$i";
@ -122,40 +124,45 @@ if ($action == 'add')
$tauxtva = "tauxtva$i"; $tauxtva = "tauxtva$i";
$qty = "qty$i"; $qty = "qty$i";
if (strlen($$label) > 0 && $$amount > 0) if (strlen($_POST["$label"]) > 0 && $_POST["$amount"] > 0)
{ {
$atleastoneline=1; $atleastoneline=1;
$facfou->addline($$label, $$amount, $$tauxtva, $$qty, 1); $facfou->addline($_POST["$label"], $_POST["$amount"], $_POST["$tauxtva"], $_POST["$qty"], 1);
} }
} }
$db->commit(); $db->commit();
} }
else { else
{
$db->rollback(); $db->rollback();
} }
header("Location: fiche.php?facid=$facid");
} }
else { else
$mesg="<div class=\"error\">Erreur: Un numéro de facture fournisseur est obligatoire.</div>"; {
$mesg="<div class=\"error\">Erreur: Un numéro de facture fournisseur est obligatoire.</div>";
} }
} }
if ($action == 'del_ligne') if ($_GET["action"] == 'del_ligne')
{ {
$facfou = new FactureFourn($db,"",$facid); $facfou = new FactureFourn($db,"",$_GET["facid"]);
$facfou->deleteline($ligne_id); $facfou->deleteline($_GET["ligne_id"]);
$action="edit"; $_GET["action"] = "edit";
} }
if ($action == 'add_ligne') if ($_GET["action"] == 'add_ligne')
{ {
$facfou = new FactureFourn($db,"", $facid); $facfou = new FactureFourn($db,"", $_GET["facid"]);
$facfou->addline($_POST["label"], $_POST["amount"], $_POST["tauxtva"], $_POST["qty"]); $facfou->addline($_POST["label"], $_POST["amount"], $_POST["tauxtva"], $_POST["qty"]);
$action="edit"; $_GET["action"] = "edit";
} }
@ -172,19 +179,19 @@ if ($mesg) { print "<br>$mesg<br>"; }
* *
*/ */
if ($action == 'create' or $action == 'copy') if ($_GET["action"] == 'create' or $_GET["action"] == 'copy')
{ {
if ($action == 'copy') if ($_GET["action"] == 'copy')
{ {
$fac_ori = new FactureFourn($db); $fac_ori = new FactureFourn($db);
$fac_ori->fetch($facid); $fac_ori->fetch($_GET["facid"]);
} }
print_titre("Saisir une facture fournisseur"); print_titre("Saisir une facture fournisseur");
print '<form action="'.$PHP_SELF.'" method="post">'; print '<form action="'.$PHP_SELF.'" method="post">';
print '<input type="hidden" name="action" value="add">'; print '<input type="hidden" name="action" value="add">';
print '<table class="border" cellspacing="0" cellpadding="3" width="100%">'; print '<table class="border" cellspacing="0" cellpadding="3" width="100%">';
print '<tr><td>Société :</td>'; print '<tr><td>Société</td>';
print '<td><select name="socidp">'; print '<td><select name="socidp">';
@ -212,24 +219,24 @@ if ($action == 'create' or $action == 'copy')
} }
} }
print '</select></td>'; print '</select></td>';
print "<td>Commentaires :</td></tr>"; print "<td>Commentaires</td></tr>";
print '<tr><td>Numéro :</td><td><input name="facnumber" type="text"></td>'; print '<tr><td>Numéro</td><td><input name="facnumber" type="text"></td>';
print '<td rowspan="4" valign="top"><textarea name="note" wrap="soft" cols="30" rows="6"></textarea></td></tr>'; print '<td rowspan="4" valign="top"><textarea name="note" wrap="soft" cols="30" rows="6"></textarea></td></tr>';
if ($action == 'copy') if ($_GET["action"] == 'copy')
{ {
print '<tr><td>Libellé :</td><td><input size="30" name="libelle" value="'.$fac_ori->libelle.'" type="text"></td></tr>'; print '<tr><td>Libellé</td><td><input size="30" name="libelle" value="'.$fac_ori->libelle.'" type="text"></td></tr>';
} }
else else
{ {
print '<tr><td>Libellé :</td><td><input size="30" name="libelle" type="text"></td></tr>'; print '<tr><td>Libellé</td><td><input size="30" name="libelle" type="text"></td></tr>';
} }
print "<tr>".'<td>Date :</td><td>'; print "<tr>".'<td>Date</td><td>';
$html->select_date(); $html->select_date();
print '</td></tr>'; print '</td></tr>';
print '<tr><td>Auteur :</td><td>'.$user->fullname.'</td></tr>'; print '<tr><td>Auteur</td><td>'.$user->fullname.'</td></tr>';
print "</table><br>"; print "</table><br>";
print '<table cellspacing="0" cellpadding="3" class="border" width="100%">'; print '<table cellspacing="0" cellpadding="3" class="border" width="100%">';
@ -237,7 +244,7 @@ if ($action == 'create' or $action == 'copy')
for ($i = 1 ; $i < 9 ; $i++) for ($i = 1 ; $i < 9 ; $i++)
{ {
if ($action == 'copy') if ($_GET["action"] == 'copy')
{ {
$value_label = $fac_ori->lignes[$i-1][0]; $value_label = $fac_ori->lignes[$i-1][0];
$value_pu = $fac_ori->lignes[$i-1][1]; $value_pu = $fac_ori->lignes[$i-1][1];
@ -247,7 +254,7 @@ if ($action == 'create' or $action == 'copy')
{ {
$value_qty = "1"; $value_qty = "1";
} }
print '<tr><td>Ligne '.$i.' :</td>'; print '<tr><td>Ligne '.$i.'</td>';
print '<td><input size="50" name="label'.$i.'" value="'.$value_label.'" type="text"></td>'; print '<td><input size="50" name="label'.$i.'" value="'.$value_label.'" type="text"></td>';
print '<td align="center"><input type="text" size="8" name="amount'.$i.'" value="'.$value_pu.'"></td>'; print '<td align="center"><input type="text" size="8" name="amount'.$i.'" value="'.$value_pu.'"></td>';
print '<td align="center"><input type="text" size="3" name="qty'.$i.'" value="'.$value_qty.'"></td><td align="center">'; print '<td align="center"><input type="text" size="3" name="qty'.$i.'" value="'.$value_qty.'"></td><td align="center">';
@ -262,78 +269,61 @@ if ($action == 'create' or $action == 'copy')
} }
else else
{ {
if ($facid > 0) /*
* Visualisation
*
*/
if ($_GET["facid"] > 0)
{ {
$fac = new FactureFourn($db); $fac = new FactureFourn($db);
$fac->fetch($facid); $fac->fetch($_GET["facid"]);
$sql = "SELECT s.nom as socnom, s.idp as socidp, f.facnumber, f.amount, f.tva, f.total, ".$db->pdate("f.datef")." as df, f.paye, f.fk_statut as statut, f.note, f.libelle, f.rowid";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture_fourn as f WHERE f.fk_soc = s.idp AND f.rowid = $facid";
$result = $db->query( $sql);
if ($result)
{
$num = $db->num_rows();
if ($num)
{
$obj = $db->fetch_object( $i);
}
$db->free();
}
else
{
print $db->error();
}
/* /*
* Fiche facture en mode edition * Fiche facture en mode edition
* *
*/ */
if ($action == "edit") if ($_GET["action"] == "edit")
{ {
print_titre('Facture : '.$obj->facnumber); print_titre('Facture : '.$fac->ref);
print "<form action=\"$PHP_SELF?facid=$obj->rowid\" method=\"post\">"; print "<form action=\"$PHP_SELF?facid=$fac->id\" method=\"post\">";
print '<input type="hidden" name="action" value="update">'; print '<input type="hidden" name="action" value="update">';
print '<table class="border" cellspacing="0" cellpadding="2" width="100%">'; print '<table class="border" cellspacing="0" cellpadding="2" width="100%">';
print "<tr><td width=\"20%\">Société :</td>"; print "<tr><td width=\"20%\">Société</td>";
print '<td width="20%">'.stripslashes($obj->socnom); print '<td width="20%">'.stripslashes($fac->socnom).'</td>';
print '</td>'; print '<td width="60%" valign="top">Commentaires</tr>';
print '<td width="60%" valign="top">Commentaires :</tr>';
print "<tr>".'<td valign="top">Numéro :</td><td valign="top">'; print "<tr>".'<td valign="top">Numéro</td><td valign="top">';
print '<input name="facnumber" type="text" value="'.$obj->facnumber.'"></td>'; print '<input name="facnumber" type="text" value="'.$fac->ref.'"></td>';
print '<td rowspan="7" width="60%" valign="top">'; print '<td rowspan="7" width="60%" valign="top">';
print '<textarea name="note" wrap="soft" cols="60" rows="10">'; print '<textarea name="note" wrap="soft" cols="60" rows="10">';
print stripslashes($obj->note); print stripslashes($fac->note);
print '</textarea></td></tr>'; print '</textarea></td></tr>';
print "<tr>".'<td valign="top">Libellé :</td><td>'; print "<tr>".'<td valign="top">Libellé</td><td>';
print '<input size="30" name="libelle" type="text" value="'.stripslashes($obj->libelle).'"></td></tr>'; print '<input size="30" name="libelle" type="text" value="'.stripslashes($fac->libelle).'"></td></tr>';
print "<tr>".'<td>Montant HT</td>';
print "<tr>".'<td>Montant HT :</td>';
print '<td valign="top">'.price($fac->total_ht).'</td></tr>'; print '<td valign="top">'.price($fac->total_ht).'</td></tr>';
print "<tr><td>Date</td><td>";
print "<tr><td>Date :</td><td>"; print_date_select($fac->datep);
print_date_select($obj->df);
print "</td></tr>"; print "</td></tr>";
$authorfullname="&nbsp;"; $authorfullname="&nbsp;";
if ($fac->author) { if ($fac->author)
$author = new User($db, $fac->author); {
$author->fetch(''); $author = new User($db, $fac->author);
$authorfullname=$author->fullname; $author->fetch('');
} $authorfullname=$author->fullname;
print "<tr><td>Auteur :</td><td>$authorfullname</td></tr>"; }
print "<tr><td>Statut:</td><td>".$fac->LibStatut($fac->paye,$fac->statut)."</td></tr>"; print "<tr><td>Auteur</td><td>$authorfullname</td></tr>";
print "<tr><td>Statut</td><td>".$fac->LibStatut($fac->paye,$fac->statut)."</td></tr>";
print "<tr><td colspan=\"2\" align=\"center\"><input type=\"submit\" value=\"Enregistrer\"></td></tr>"; print "<tr><td colspan=\"2\" align=\"center\"><input type=\"submit\" value=\"Enregistrer\"></td></tr>";
print "</table>"; print "</table>";
print "</form>"; print "</form>";
@ -342,7 +332,7 @@ else
* Lignes * Lignes
* *
*/ */
print "<p><form action=\"$PHP_SELF?facid=$obj->rowid&amp;action=add_ligne\" method=\"post\">"; print "<p><form action=\"$PHP_SELF?facid=$fac->id&amp;action=add_ligne\" method=\"post\">";
print '<table class="noborder" cellspacing="0" cellpadding="2" width="100%">'; print '<table class="noborder" cellspacing="0" cellpadding="2" width="100%">';
print '<tr class="liste_titre"><td>Libellé</td><td align="center">P.U. HT</td><td align="center">Quantité</td><td align="center">Total HT</td>'; print '<tr class="liste_titre"><td>Libellé</td><td align="center">P.U. HT</td><td align="center">Quantité</td><td align="center">Total HT</td>';
print '<td align="center">Taux TVA</td>'; print '<td align="center">Taux TVA</td>';
@ -358,7 +348,7 @@ else
print '<td align="center">'.price($fac->lignes[$i][5])."</td>"; print '<td align="center">'.price($fac->lignes[$i][5])."</td>";
print '<td align="right">'.price($fac->lignes[$i][6])."</td>"; print '<td align="right">'.price($fac->lignes[$i][6])."</td>";
print '<td align="center">'; print '<td align="center">';
print '<a href="fiche.php?facid='.$facid.'&amp;action=del_ligne&amp;ligne_id='.$fac->lignes[$i][7].'">'.img_delete().'</a></td>'; print '<a href="fiche.php?facid='.$fac->id.'&amp;action=del_ligne&amp;ligne_id='.$fac->lignes[$i][7].'">'.img_delete().'</a></td>';
print '</tr>'; print '</tr>';
} }
@ -389,8 +379,8 @@ else
* *
*/ */
$head[0][0] = DOL_URL_ROOT."$PHP_SELF?facid=".$_GET["facid"]; $head[0][0] = DOL_URL_ROOT."$PHP_SELF?facid=".$fac->id;
$head[0][1] = 'Facture : '.$obj->facnumber; $head[0][1] = 'Facture : '.$fac->ref;
$h = 1; $h = 1;
$a = 0; $a = 0;
@ -402,30 +392,31 @@ else
* Facture * Facture
*/ */
print '<table class="border" cellspacing="0" cellpadding="2" width="100%">'; print '<table class="border" cellspacing="0" cellpadding="2" width="100%">';
print "<tr><td>Société</td><td colspan=\"3\"><b><a href=\"../fiche.php?socid=$obj->socidp\">$obj->socnom</a></b></td>"; print "<tr><td>Société</td><td colspan=\"3\"><b><a href=\"../fiche.php?socid=$fac->socidp\">$fac->socnom</a></b></td>";
print "<td align=\"right\"><a href=\"index.php?socid=$obj->socidp\">Autres factures</a></td>\n"; print "<td align=\"right\"><a href=\"index.php?socid=$fac->socidp\">Autres factures</a></td>\n";
print "</tr>"; print "</tr>";
print "<tr><td>Date</td><td colspan=\"4\">".dolibarr_print_date($obj->df,"%A %d %B %Y")."</td></tr>\n"; print "<tr><td>Date</td><td colspan=\"4\">".dolibarr_print_date($fac->datep,"%A %d %B %Y")."</td></tr>\n";
print "<tr><td>Libellé</td><td colspan=\"4\">"; print "<tr><td>Libellé</td><td colspan=\"4\">";
print $obj->libelle; print $fac->libelle;
print "</td>"; print "</td>";
$authorfullname="&nbsp;"; $authorfullname="&nbsp;";
if ($fac->author) { if ($fac->author)
$author = new User($db, $fac->author); {
$author->fetch(''); $author = new User($db, $fac->author);
$authorfullname=$author->fullname; $author->fetch('');
} $authorfullname=$author->fullname;
}
print "<tr><td>Auteur</td><td colspan=\"4\">$authorfullname</td>"; print "<tr><td>Auteur</td><td colspan=\"4\">$authorfullname</td>";
print "<tr><td>Statut:</td><td colspan=\"4\">".$fac->LibStatut($fac->paye,$fac->statut)."</td></tr>"; print "<tr><td>Statut</td><td colspan=\"4\">".$fac->LibStatut($fac->paye,$fac->statut)."</td></tr>";
print "<tr>".'<td>&nbsp</td><td>Total HT</td><td align="right"><b>'.price($fac->total_ht)."</b></td>"; print "<tr>".'<td>&nbsp</td><td>Total HT</td><td align="right"><b>'.price($fac->total_ht)."</b></td>";
print '<td align="right">TVA</td><td align="right">'.price($fac->total_tva)."</td></tr>"; print '<td align="right">TVA</td><td align="right">'.price($fac->total_tva)."</td></tr>";
print "<tr>".'<td>&nbsp</td><td>Total TTC</td><td colspan="3" align="center">'.price($fac->total_ttc)."</td></tr>"; print "<tr>".'<td>&nbsp</td><td>Total TTC</td><td colspan="3" align="center">'.price($fac->total_ttc)."</td></tr>";
if (strlen($obj->note)) if (strlen($fac->note))
{ {
print "<tr>".'<td>Commentaires</td><td colspan="4">'; print "<tr>".'<td>Commentaires</td><td colspan="4">';
print nl2br(stripslashes($obj->note)); print nl2br(stripslashes($fac->note));
print '</td></tr>'; print '</td></tr>';
} }
print "</table>"; print "</table>";
@ -451,7 +442,7 @@ else
print "<td>Date</td>"; print "<td>Date</td>";
print "<td>Type</td>"; print "<td>Type</td>";
if ($obj->statut == 1 && $obj->paye == 0 && $user->societe_id == 0) if ($fac->statut == 1 && $fac->paye == 0 && $user->societe_id == 0)
{ {
$tdsup=' colspan="2"'; $tdsup=' colspan="2"';
} }
@ -468,10 +459,10 @@ else
print "<td>$objp->paiement_type $objp->num_paiement</TD>\n"; print "<td>$objp->paiement_type $objp->num_paiement</TD>\n";
print "<td align=\"right\">".price($objp->amount)."</TD><td>".MAIN_MONNAIE."</td>\n"; print "<td align=\"right\">".price($objp->amount)."</TD><td>".MAIN_MONNAIE."</td>\n";
if ($obj->statut == 1 && $obj->paye == 0 && $user->societe_id == 0) if ($fac->statut == 1 && $fac->paye == 0 && $user->societe_id == 0)
{ {
print '<td align="center">'; print '<td align="center">';
print '<a href="fiche.php?facid='.$facid.'&amp;action=deletepaiement&amp;paiement_id='.$objp->rowid.'">'; print '<a href="fiche.php?facid='.$fac->id.'&amp;action=deletepaiement&amp;paiement_id='.$objp->rowid.'">';
print img_delete(); print img_delete();
print '</a></td>'; print '</a></td>';
} }
@ -482,11 +473,14 @@ else
} }
print "<tr $bc[1]><td colspan=\"2\" align=\"right\">Total :</td><td align=\"right\"><b>".price($total)."</b></td><td$tdsup>".MAIN_MONNAIE."</td></tr>\n"; print "<tr $bc[1]><td colspan=\"2\" align=\"right\">Total :</td><td align=\"right\"><b>".price($total)."</b></td><td$tdsup>".MAIN_MONNAIE."</td></tr>\n";
$resteapayer = abs($fac->total_ttc - $total);
print "<tr $bc[1]><td colspan=\"2\" align=\"right\">Reste a payer :</td>"; if ($fac->statut > 0)
print '<td align="right"><b>'.price($resteapayer)."</b></td><td$tdsup>".MAIN_MONNAIE."</td>"; {
print "</tr>\n"; $resteapayer = abs($fac->total_ttc - $total);
print "<tr $bc[1]><td colspan=\"2\" align=\"right\">Reste à payer :</td>";
print '<td align="right"><b>'.price($resteapayer)."</b></td><td$tdsup>".MAIN_MONNAIE."</td>";
print "</tr>\n";
}
print "</table>"; print "</table>";
$db->free(); $db->free();
@ -532,50 +526,51 @@ else
* *
*/ */
print "<div class=\"tabsAction\">\n"; print "<div class=\"tabsAction\">\n";
if ($obj->statut == 0 && $user->societe_id == 0) if ($fac->statut == 0 && $user->societe_id == 0)
{ {
if ($action != "edit") if ($_GET["action"] != "edit")
{ {
print '<a class="tabAction" href="index.php?facid='.$facid.'&amp;action=delete">Supprimer</a>'; print '<a class="tabAction" href="index.php?facid='.$fac->id.'&amp;action=delete">Supprimer</a>';
} }
} }
elseif ($obj->statut == 1 && $obj->paye == 0 && $user->societe_id == 0) elseif ($fac->statut == 1 && $fac->paye == 0 && $user->societe_id == 0)
{ {
print '<a class="tabAction" href="paiement.php?facid='.$fac->id.'&amp;action=create">Emmettre un paiement</a>'; print '<a class="tabAction" href="paiement.php?facid='.$fac->id.'&amp;action=create">Emmettre un paiement</a>';
} }
if ($obj->statut == 0 && $user->societe_id == 0) if ($fac->statut == 0 && $user->societe_id == 0)
{ {
if ($action == "edit") if ($_GET["action"] == "edit")
{ {
print '<a class="tabAction" href="fiche.php?facid='.$obj->rowid.'">Abandonner</a>'; print '<a class="tabAction" href="fiche.php?facid='.$fac->id.'">Abandonner</a>';
} }
else else
{ {
print '<a class="tabAction" href="fiche.php?facid='.$obj->rowid.'&amp;action=edit">Editer</a>'; print '<a class="tabAction" href="fiche.php?facid='.$fac->id.'&amp;action=edit">Editer</a>';
} }
} }
if ($obj->statut == 1 && price($resteapayer) <= 0 && $obj->paye == 0 && $user->societe_id == 0) if ($fac->statut == 1 && price($resteapayer) <= 0 && $fac->paye == 0 && $user->societe_id == 0)
{ {
print "<a class=\"tabAction\" href=\"fiche.php?facid=$facid&amp;action=payed\">Classer 'Payée'</a>"; print "<a class=\"tabAction\" href=\"fiche.php?facid=$fac->id&amp;action=payed\">Classer 'Payée'</a>";
} }
if ($user->societe_id == 0) if ($user->societe_id == 0)
{ {
if ($obj->statut == 0) if ($fac->statut == 0)
{ {
print "<a class=\"tabAction\" href=\"$PHP_SELF?facid=$facid&amp;action=valid\">Valider</a>"; if ($_GET["action"] <> "edit")
print "<a class=\"tabAction\" href=\"$PHP_SELF?facid=$fac->id&amp;action=valid\">Valider</a>";
} }
else else
{ {
print "<a class=\"tabAction\" href=\"$PHP_SELF?facid=$facid&amp;action=copy&amp;socid=$fac->socidp\">Copier</a>"; print "<a class=\"tabAction\" href=\"$PHP_SELF?facid=$fac->id&amp;action=copy&amp;socid=$fac->socidp\">Copier</a>";
} }
} }
print "</div>"; print "</div>";
} }
} }