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

Gestion des conditions de rglement

Browse Source
This commit is contained in:
Rodolphe Quiedeville 2003-07-21 13:05:24 +00:00
parent 3a8e222bd1
commit 9c4fa650d7
2 changed files with 101 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
htdocs/compta/facture.php3
View File

@ -133,30 +133,26 @@ if ($action == 'delete')
if ($action == 'add') if ($action == 'add')
{ {
$datefacture = $db->idate(mktime(12, 0 , 0, $remonth, $reday, $reyear)); $datefacture = mktime(12, 0 , 0, $remonth, $reday, $reyear);
$facture = new Facture($db, $socid);
$facture->number = $HTTP_POST_VARS["facnumber"];
$facture->date = $datefacture;
$facture->note = $HTTP_POST_VARS["note"];
$facture->projetid = $HTTP_POST_VARS["projetid"];
$facture->cond_reglement = $HTTP_POST_VARS["condid"];
if (! $propalid) if (! $propalid)
{ {
$facture = new Facture($db, $socid); $facture->amount = $HTTP_POST_VARS["amount"];
$facture->number = $facnumber; $facture->remise = $HTTP_POST_VARS["remise"];
$facture->date = $datefacture;
$facture->projetid = $HTTP_POST_VARS["projetid"];
$facture->note = $note;
$facture->amount = $amount;
$facture->remise = $remise;
$facid = $facture->create($user->id, $statut, $note); $facid = $facture->create($user->id, $statut, $note);
} }
else else
{ {
$facture = new Facture($db, $socid); $facture->amount = $HTTP_POST_VARS["amount"];
$facture->number = $facnumber;
$facture->date = $datefacture;
$facture->note = $note;
$facture->projetid = $HTTP_POST_VARS["projetid"];
$facture->amount = $amount;
$facture->remise = $remise; $facture->remise = $remise;
$facture->propalid = $propalid; $facture->propalid = $propalid;
@ -291,7 +287,7 @@ if ($action == 'create')
print '<input type="hidden" name="action" value="add">'; print '<input type="hidden" name="action" value="add">';
print "<input type=\"hidden\" name=\"socid\" value=\"$obj->idp\">"; print "<input type=\"hidden\" name=\"socid\" value=\"$obj->idp\">";
print '<table cellspacing="0" border="1" width="100%">'; print '<table cellspacing="0" cellpadding="3" border="1" width="100%">';
print "<tr><td>Client :</td><td>$obj->nom</td>"; print "<tr><td>Client :</td><td>$obj->nom</td>";
print "<td>Commentaire</td></tr>"; print "<td>Commentaire</td></tr>";
@ -299,7 +295,7 @@ if ($action == 'create')
print "<input type=\"hidden\" name=\"author\" value=\"$author\">"; print "<input type=\"hidden\" name=\"author\" value=\"$author\">";
print "<tr><td>Auteur :</td><td>".$user->fullname."</td>"; print "<tr><td>Auteur :</td><td>".$user->fullname."</td>";
print '<td rowspan="4" valign="top">'; print '<td rowspan="5" valign="top">';
print '<textarea name="note" wrap="soft" cols="60" rows="8"></textarea></td></tr>'; print '<textarea name="note" wrap="soft" cols="60" rows="8"></textarea></td></tr>';
print "<tr><td>Date :</td><td>"; print "<tr><td>Date :</td><td>";
@ -309,6 +305,26 @@ if ($action == 'create')
print "</td></tr>"; print "</td></tr>";
print "<tr><td>Numéro :</td><td> <input name=\"facnumber\" type=\"text\" value=\"$numfa\"></td></tr>"; print "<tr><td>Numéro :</td><td> <input name=\"facnumber\" type=\"text\" value=\"$numfa\"></td></tr>";
print "<tr><td>Conditions de réglement :</td><td>";
$sql = "SELECT rowid, libelle FROM llx_cond_reglement ORDER BY sortorder";
$result = $db->query($sql);
$conds=array();
if ($result)
{
$num = $db->num_rows();
$i = 0;
while ($i < $num)
{
$objp = $db->fetch_object($i);
$conds[$objp->rowid]=$objp->libelle;
$i++;
}
$db->free();
}
$html->select_array("condid",$conds);
print "</td></tr>";
print "<tr><td>Projet :</td><td>"; print "<tr><td>Projet :</td><td>";
$proj = new Project($db); $proj = new Project($db);
$html->select_array("projetid",$proj->liste_array($socidp)); $html->select_array("projetid",$proj->liste_array($socidp));
@ -390,33 +406,24 @@ else
$author->id = $obj->fk_user_author; $author->id = $obj->fk_user_author;
$author->fetch(); $author->fetch();
print_titre("Facture : ".$obj->facnumber); print_titre("Facture : ".$fac->ref);
print "<table border=\"0\" cellspacing=\"0\" cellpadding=\"2\" width=\"100%\">";
print "<tr><td width=\"50%\">";
/* /*
* Facture * Facture
*/ */
print "<table border=\"1\" cellspacing=\"0\" cellpadding=\"2\" width=\"100%\">"; print "<table border=\"1\" cellspacing=\"0\" cellpadding=\"2\" width=\"100%\">";
print "<tr><td>Client</td>"; print "<tr><td>Client</td>";
print "<td colspan=\"3\">"; print "<td colspan=\"3\">";
print "<b><a href=\"fiche.php3?socid=$obj->socidp\">$obj->socnom</a></b></td></tr>"; print "<b><a href=\"fiche.php3?socid=$obj->socidp\">$obj->socnom</a></b></td>";
print "<td>Conditions de réglement : " . $fac->cond_reglement ."</td></tr>";
print "<tr><td>Date</td>"; print "<tr><td>Date</td>";
print "<td colspan=\"3\">".strftime("%A %d %B %Y",$obj->df)."</td></tr>\n"; print "<td colspan=\"3\">".strftime("%A %d %B %Y",$obj->df)."</td>\n";
print "<td>Date limite de réglement : " . strftime("%d %B %Y",$fac->date_lim_reglement) ."</td></tr>";
print "<tr><td>Auteur</td><td colspan=\"3\">$author->fullname</td>"; print "<tr><td>Auteur</td><td colspan=\"3\">$author->fullname</td>";
print '<tr><td>Montant</td>'; print '<td rowspan="4" valign="top">';
print '<td align="right" colspan="2"><b>'.price($fac->total_ht).'</b></td>';
print '<td>euros HT</td></tr>';
print '<tr><td>TVA</td><td align="right" colspan="2">'.price($fac->total_tva).'</td>';
print '<td>euros</td></tr>';
print '<tr><td>Total</td><td align="right" colspan="2">'.price($fac->total_ttc).'</td>';
print '<td>euros TTC</td></tr>';
print "</table>";
print "</td><td valign=\"top\">";
$_MONNAIE="euros"; $_MONNAIE="euros";
@ -431,7 +438,7 @@ else
{ {
$num = $db->num_rows(); $num = $db->num_rows();
$i = 0; $total = 0; $i = 0; $total = 0;
print "<p><b>Paiements</b>"; print "<b>Paiements</b>";
echo '<TABLE border="0" width="100%" cellspacing="0" cellpadding="3">'; echo '<TABLE border="0" width="100%" cellspacing="0" cellpadding="3">';
print "<TR class=\"liste_titre\">"; print "<TR class=\"liste_titre\">";
print "<td>Date</td>"; print "<td>Date</td>";
@ -478,11 +485,20 @@ else
} }
print "</td></tr>"; print "</td></tr>";
if ($obj->note)
print '<tr><td>Montant</td>';
print '<td align="right" colspan="2"><b>'.price($fac->total_ht).'</b></td>';
print '<td>euros HT</td></tr>';
print '<tr><td>TVA</td><td align="right" colspan="2">'.price($fac->total_tva).'</td>';
print '<td>euros</td></tr>';
print '<tr><td>Total</td><td align="right" colspan="2">'.price($fac->total_ttc).'</td>';
print '<td>euros TTC</td></tr>';
if ($fac->note)
{ {
print "<tr><td>Note : ".nl2br($obj->note)."</td></tr>"; print '<tr><td colspan="5">Note : '.nl2br($obj->note)."</td></tr>";
} }
print "</table>";
print "</table><br>";
/* /*
* Lignes de factures * Lignes de factures
* *
@ -698,7 +714,7 @@ else
if ($num) if ($num)
{ {
$i = 0; $total = 0; $i = 0; $total = 0;
print '<TABLE border="1" cellspacing="0" cellpadding="4">'; print '<TABLE border="1" cellspacing="0" cellpadding="4" width="100%">';
print "<TR $bc[$var]>"; print "<TR $bc[$var]>";
print "<td>Date</td>"; print "<td>Date</td>";
print "<td>Action</td>"; print "<td>Action</td>";
@ -709,9 +725,9 @@ else
{ {
$objp = $db->fetch_object( $i); $objp = $db->fetch_object( $i);
$var=!$var; $var=!$var;
print "<TR $bc[$var]>"; print "<tr $bc[$var]>";
print "<TD>".strftime("%d %B %Y",$objp->da)."</TD>\n"; print "<td>".strftime("%d %B %Y",$objp->da)."</TD>\n";
print '<TD align="right">'.stripslashes($objp->note).'</TD>'; print '<td>'.stripslashes($objp->note).'</TD>';
print "</tr>"; print "</tr>";
$i++; $i++;
} }
@ -844,7 +860,7 @@ else
$sortfield="f.datef"; $sortfield="f.datef";
} }
$sql = "SELECT s.nom,s.idp,f.facnumber,f.amount,".$db->pdate("f.datef")." as df,f.paye,f.rowid as facid"; $sql = "SELECT s.nom,s.idp,f.facnumber,f.amount,".$db->pdate("f.datef")." as df,f.paye,f.rowid as facid, f.fk_statut";
$sql .= " FROM llx_societe as s,llx_facture as f WHERE f.fk_soc = s.idp"; $sql .= " FROM llx_societe as s,llx_facture as f WHERE f.fk_soc = s.idp";
if ($socidp) if ($socidp)
@ -887,10 +903,10 @@ else
$var=True; $var=True;
while ($i < min($num,$limit)) while ($i < min($num,$limit))
{ {
$objp = $db->fetch_object( $i); $objp = $db->fetch_object($i);
$var=!$var; $var=!$var;
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)
{ {
@ -924,7 +940,14 @@ else
if (! $objp->paye) if (! $objp->paye)
{ {
print '<td align="center">impayée</td>'; if ($objp->fk_statut == 0)
{
print '<td align="center">brouillon</td>';
}
else
{
print '<td align="center">impayée</td>';
}
} }
else else
{ {
@ -933,20 +956,16 @@ else
print "</TR>\n"; print "</TR>\n";
$i++; $i++;
$j++;
} }
} }
if ($i == 0) { $i=1; } if ($j == 0) { $j=1; }
print "</TABLE>"; print "</table>";
$db->free(); $db->free();
} }
else else
{ {
print $db->error(); print $db->error();
} }
} }
} }

32
htdocs/facture.class.php3
View File

@ -71,6 +71,21 @@ class Facture
Function create($userid) Function create($userid)
{ {
/*
*
*/
$sql = "SELECT fdm,nbjour FROM llx_cond_reglement WHERE rowid = $this->cond_reglement";
if ($this->db->query($sql) )
{
if ($this->db->num_rows())
{
$obj = $this->db->fetch_object(0);
$cdr_nbjour = $obj->nbjour;
$cdr_fdm = $obj->fdm;
}
$this->db->free();
}
$datelim = $this->date + ( $cdr_nbjour * 3600 * 24 );
/* /*
* Insertion dans la base * Insertion dans la base
*/ */
@ -93,9 +108,8 @@ class Facture
$tva = tva($totalht); $tva = tva($totalht);
$total = $totalht + $tva; $total = $totalht + $tva;
$sql = "INSERT INTO $this->db_table (facnumber, fk_soc, datec, amount, remise, tva, total, datef, note, fk_user_author,fk_projet) "; $sql = "INSERT INTO $this->db_table (facnumber, fk_soc, datec, amount, remise, tva, total, datef, note, fk_user_author,fk_projet, fk_cond_reglement, date_lim_reglement) ";
$sql .= " VALUES ('$number', $socid, now(), $totalht, $remise, $tva, $total, $this->date,'$note',$userid, $this->projetid);"; $sql .= " VALUES ('$number', $socid, now(), $totalht, $remise, $tva, $total,".$this->db->idate($this->date).",'$this->note',$userid, $this->projetid, $this->cond_reglement,".$this->db->idate($datelim).")";
if ( $this->db->query($sql) ) if ( $this->db->query($sql) )
{ {
$this->id = $this->db->last_insert_id(); $this->id = $this->db->last_insert_id();
@ -123,8 +137,9 @@ class Facture
Function fetch($rowid) Function fetch($rowid)
{ {
$sql = "SELECT fk_soc,facnumber,amount,tva,total,remise,".$this->db->pdate(datef)."as df,fk_projet"; $sql = "SELECT f.fk_soc,f.facnumber,f.amount,f.tva,f.total,f.remise,".$this->db->pdate("f.datef")."as df,f.fk_projet,".$this->db->pdate("f.date_lim_reglement")." as dlr, c.libelle, f.note";
$sql .= " FROM llx_facture WHERE rowid=$rowid;"; $sql .= " FROM llx_facture as f, llx_cond_reglement as c";
$sql .= " WHERE f.rowid=$rowid AND c.rowid = f.fk_cond_reglement";
if ($this->db->query($sql) ) if ($this->db->query($sql) )
{ {
@ -141,7 +156,10 @@ class Facture
$this->total_ttc = $obj->total; $this->total_ttc = $obj->total;
$this->remise = $obj->remise; $this->remise = $obj->remise;
$this->socidp = $obj->fk_soc; $this->socidp = $obj->fk_soc;
$this->date_lim_reglement = $obj->dlr;
$this->cond_reglement = $obj->libelle;
$this->projetid = $obj->fk_projet; $this->projetid = $obj->fk_projet;
$this->note = stripslashes($obj->note);
$this->lignes = array(); $this->lignes = array();
$this->db->free(); $this->db->free();
@ -177,6 +195,10 @@ class Facture
print $this->db->error(); print $this->db->error();
} }
} }
else
{
print "Error";
}
} }
else else
{ {