Renommage de la classe FactureFourn en FactureFournisseur

This commit is contained in:
Rodolphe Quiedeville 2005-04-05 07:58:01 +00:00
parent 6a5d34e664
commit 15f5f86473
6 changed files with 25 additions and 512 deletions

View File

@ -1,486 +0,0 @@
<?php
/* Copyright (C) 2002-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004 Christophe Combelles <ccomb@free.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
* $Id$
* $Source$
*
*/
/**
\file htdocs/facturefourn.class.php
\ingroup facture
\brief Fichier de la classe des factures fournisseurs
\version $Revision$
*/
/**
\class FactureFourn
\brief Classe permettant la gestion des factures fournisseurs
*/
class FactureFourn
{
var $id;
var $db;
var $socid;
var $number;
var $statut;
var $paye;
var $author;
var $libelle;
var $date;
var $ref;
var $amount;
var $remise;
var $tva;
var $total_ht;
var $total_tva;
var $total_ttc;
var $note;
var $db_table;
var $propalid;
var $lignes;
/**
* \brief Constructeur de la classe
* \param DB handler accès base de données
* \param soc_idp id societe ("" par defaut)
* \param facid id facture ("" par defaut)
*/
function FactureFourn($DB, $soc_idp="", $facid="")
{
$this->db = $DB ;
$this->socidp = $soc_idp;
$this->products = array();
$this->db_table = MAIN_DB_PREFIX."facture";
$this->amount = 0;
$this->remise = 0;
$this->tva = 0;
$this->total = 0;
$this->propalid = 0;
$this->id = $facid;
$this->lignes = array();
}
/**
* \brief Création de la facture en base
* \param user object utilisateur qui crée
*
*/
function create($user)
{
/*
* Insertion dans la base
*/
$socid = $this->socidp;
$number = $this->number;
$amount = $this->amount;
$remise = $this->remise;
if (! $remise)
{
$remise = 0 ;
}
$totalht = ($amount - $remise);
$tva = tva($totalht);
$total = $totalht + $tva;
$sql = "INSERT INTO ".MAIN_DB_PREFIX."facture_fourn (facnumber, libelle, fk_soc, datec, datef, note, fk_user_author) ";
$sql .= " VALUES ('".$this->number."','".$this->libelle."',". $this->socid.", now(),".$this->date.",'".$this->note."', ".$user->id.");";
if ( $this->db->query($sql) )
{
$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."facture_fourn");
for ($i = 0 ; $i < sizeof($this->lignes) ; $i++)
{
$sql = "INSERT INTO ".MAIN_DB_PREFIX."facture_fourn_det (fk_facture_fourn)";
$sql .= " VALUES ($this->id);";
if ($this->db->query($sql) )
{
$idligne = $this->db->last_insert_id(MAIN_DB_PREFIX."facture_fourn_det");
$this->updateline($idligne,
$this->lignes[$i][0],
$this->lignes[$i][1],
$this->lignes[$i][2],
$this->lignes[$i][3]);
}
}
/*
* Mise à jour prix
*/
$this->updateprice($this->id);
return $this->id;
}
else
{
if ($this->db->errno() == DB_ERROR_RECORD_ALREADY_EXISTS) {
print "Erreur : Une facture possédant cet id existe déjà";
}
else {
dolibarr_print_error($this->db);
}
return 0;
}
}
/**
* \brief Recupére l'objet facture et ses lignes de factures
* \param rowid id de la facture a récupérer
*/
function fetch($rowid)
{
$sql = "SELECT fk_soc,libelle,facnumber,amount,remise,".$this->db->pdate(datef)."as df";
$sql .= ", total_ht, total_tva, total_ttc, fk_user_author";
$sql .= ", fk_statut, paye, f.note";
$sql .= ", s.nom as socnom, s.idp as socidp";
$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f,".MAIN_DB_PREFIX."societe as s";
$sql .= " WHERE f.rowid=$rowid AND f.fk_soc = s.idp ;";
if ($this->db->query($sql) )
{
if ($this->db->num_rows())
{
$obj = $this->db->fetch_object();
$this->id = $rowid;
$this->datep = $obj->df;
$this->ref = $obj->facnumber;
$this->libelle = $obj->libelle;
$this->remise = $obj->remise;
$this->socidp = $obj->fk_soc;
$this->total_ht = $obj->total_ht;
$this->total_tva = $obj->total_tva;
$this->total_ttc = $obj->total_ttc;
$this->author = $obj->fk_user_author;
$this->statut = $obj->fk_statut;
$this->paye = $obj->paye;
$this->socidp = $obj->socidp;
$this->socnom = $obj->socnom;
$this->note = $obj->note;
$this->db->free();
/*
* Lignes
*/
$sql = "SELECT rowid,description, pu_ht, qty, tva_taux, tva, total_ht, total_ttc FROM ".MAIN_DB_PREFIX."facture_fourn_det WHERE fk_facture_fourn=".$this->id;
if ($this->db->query($sql) )
{
$num = $this->db->num_rows();
$i = 0;
if ($num)
{
while ($i < $num)
{
$obj = $this->db->fetch_object();
$this->lignes[$i][0] = stripslashes($obj->description);
$this->lignes[$i][1] = $obj->pu_ht;
$this->lignes[$i][2] = $obj->tva_taux;
$this->lignes[$i][3] = $obj->qty;
$this->lignes[$i][4] = $obj->total_ht;
$this->lignes[$i][5] = $obj->tva;
$this->lignes[$i][6] = $obj->total_ttc;
$this->lignes[$i][7] = $obj->rowid;
$i++;
}
}
}
else
{
dolibarr_print_error($this->db);
}
}
}
else
{
dolibarr_print_error($this->db);
}
}
/**
* \brief Supprime la facture
* \param rowid id de la facture à supprimer
*/
function delete($rowid)
{
$sql = "DELETE FROM ".MAIN_DB_PREFIX."facture_fourn WHERE rowid = $rowid AND fk_statut = 0";
if ( $this->db->query( $sql) )
{
if ( $this->db->affected_rows() )
{
$sql = "DELETE FROM ".MAIN_DB_PREFIX."facture_fourn_det WHERE fk_facture_fourn = $rowid;";
if ($this->db->query( $sql) )
{
return 1;
}
else
{
dolibarr_print_error($this->db);
}
}
}
else
{
dolibarr_print_error($this->db);
}
}
/**
* \brief Tag la facture comme payée complètement
* \param userid utilisateur qui modifie l'état
*/
function set_payed($userid)
{
$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn set paye = 1 WHERE rowid = ".$this->id;
$result = $this->db->query( $sql);
if (! $result) {
dolibarr_print_error($this->db);
}
}
/**
* \brief Tag la facture comme validée et valide la facture
* \param userid utilisateur qui valide la facture
*/
function set_valid($userid)
{
$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn set fk_statut = 1, fk_user_valid = $userid WHERE rowid = ".$this->id;
$result = $this->db->query( $sql);
if (! $result) {
dolibarr_print_error($this->db);
}
}
/**
* \brief Ajoute une ligne de facture (associé à aucun produit/service prédéfini)
* \param desc description de la ligne
* \param pu prix unitaire
* \param tauxtva taux de tva
* \param qty quantité
*/
function addline($desc, $pu, $tauxtva, $qty)
{
$sql = "INSERT INTO ".MAIN_DB_PREFIX."facture_fourn_det (fk_facture_fourn)";
$sql .= " VALUES ($this->id);";
if ($this->db->query($sql) )
{
$idligne = $this->db->last_insert_id(MAIN_DB_PREFIX."facture_fourn_det");
$this->updateline($idligne, $desc, $pu, $tauxtva, $qty);
}
else
{
dolibarr_print_error($this->db);
}
// Mise a jour prix facture
$this->updateprice($this->id);
}
/**
* \brief Mets à jour une ligne de facture
* \param id id de la ligne de facture
* \param label description de la ligne
* \param puht prix unitaire
* \param tauxtva taux tva
* \param qty quantité
* \return int 0 si erreur
*/
function updateline($id, $label, $puht, $tauxtva, $qty=1)
{
$puht = ereg_replace(",",".",$puht);
$qty = ereg_replace(",",".",$qty);
if (is_numeric($puht) && is_numeric($qty))
{
$totalht = ($puht * $qty);
$tva = ($totalht * $tauxtva / 100);
$totalttc = $totalht + $tva;
$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn_det ";
$sql .= "SET description ='".$label."'";
$sql .= ", pu_ht = " .ereg_replace(",",".",$puht);
$sql .= ", qty =" .ereg_replace(",",".",$qty);
$sql .= ", total_ht=" .ereg_replace(",",".",$totalht);
$sql .= ", tva=" .ereg_replace(",",".",$tva);
$sql .= ", tva_taux=" .ereg_replace(",",".",$tauxtva);
$sql .= ", total_ttc=".ereg_replace(",",".",$totalttc);
$sql .= " WHERE rowid = ".$id;
if (! $this->db->query($sql) )
{
dolibarr_print_error($this->db);
}
// Mise a jour prix facture
$this->updateprice($this->id);
}
}
/**
* \brief Supprime une ligne facture de la base
* \param rowid id de la ligne de facture a supprimer
*/
function deleteline($rowid)
{
// Supprime ligne
$sql = "DELETE FROM ".MAIN_DB_PREFIX."facture_fourn_det ";
$sql .= " WHERE rowid = $rowid";
if (! $this->db->query($sql) )
{
dolibarr_print_error($this->db);
}
// Mise a jour prix facture
$this->updateprice($this->id);
return 1;
}
/**
* \brief Mise à jour des sommes de la facture
* \param facid id de la facture a modifier
*/
function updateprice($facid)
{
$total_ht = 0;
$total_tva = 0;
$total_ttc = 0;
$sql = "SELECT sum(total_ht), sum(tva), sum(total_ttc) FROM ".MAIN_DB_PREFIX."facture_fourn_det";
$sql .= " WHERE fk_facture_fourn = $facid;";
$result = $this->db->query($sql);
if ($result)
{
if ($this->db->num_rows() )
{
$row = $this->db->fetch_row();
$total_ht = $row[0];
$total_tva = $row[1];
$total_ttc = $row[2];
if ($total_ht == '')
$total_ht = 0;
if ($total_tva == '')
$total_tva = 0;
if ($total_ttc == '')
$total_ttc = 0;
}
$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn SET";
$sql .= " total_ht = ". ereg_replace(",",".",$total_ht);
$sql .= ",total_tva = ".ereg_replace(",",".",$total_tva);
$sql .= ",total_ttc = ".ereg_replace(",",".",$total_ttc);
$sql .= " WHERE rowid = $facid ;";
$result = $this->db->query($sql);
}
else
{
dolibarr_print_error($this->db);
}
}
/**
* \brief Retourne le libellé du statut d'une facture (brouillon, validée, abandonnée, payée)
* \return string Libellé
*/
function getLibStatut()
{
return $this->LibStatut($this->paye,$this->statut);
}
/**
* \brief Renvoi le libellé long d'un statut donné
* \param paye etat paye
* \param statut id statut
* \return string Libellé long du statut
*/
function LibStatut($paye,$statut)
{
global $langs;
$langs->load("bills");
if (! $paye)
{
if ($statut == 0) return $langs->trans("BillStatusDraft");
if ($statut == 3) return $langs->trans("BillStatusCanceled");
return $langs->trans("BillStatusValidated");
}
else
{
return $langs->trans("BillStatusPayed");
}
}
/**
* \brief Renvoi le libellé court d'un statut donné
* \param paye etat paye
* \param statut id statut
* \param amount amount already payed
* \return string Libellé court du statut
*/
function PayedLibStatut($paye,$statut,$amount=0)
{
global $langs;
$langs->load("bills");
if (! $paye)
{
if ($statut == 0) return $langs->trans("BillShortStatusDraft");
if ($statut == 3) return $langs->trans("BillStatusCanceled");
if ($amount) return $langs->trans("BillStatusStarted");
return $langs->trans("BillStatusNotPayed");
}
else
{
return $langs->trans("BillStatusPayed");
}
}
}
?>

View File

@ -31,7 +31,6 @@
require("./pre.inc.php");
require("./paiementfourn.class.php");
require("../../facturefourn.class.php");
$langs->load("bills");
$langs->load("companies");
@ -54,7 +53,7 @@ $action=isset($_GET["action"])?$_GET["action"]:$_POST["action"];
if ($_GET["action"] == 'valid')
{
$facturefourn=new FactureFourn($db);
$facturefourn=new FactureFournisseur($db);
$facturefourn->fetch($_GET["facid"]);
$facturefourn->set_valid($user->id);
@ -62,7 +61,7 @@ if ($_GET["action"] == 'valid')
if ($_GET["action"] == 'payed')
{
$facturefourn=new FactureFourn($db);
$facturefourn=new FactureFournisseur($db);
$facturefourn->fetch($_GET["facid"]);
$facturefourn->set_payed($user->id);
@ -70,7 +69,7 @@ if ($_GET["action"] == 'payed')
if($_GET["action"] == 'deletepaiement')
{
$facfou = new FactureFourn($db);
$facfou = new FactureFournisseur($db);
$facfou->fetch($_GET["facid"]);
if ($facfou->statut == 1 && $facfou->paye == 0 && $user->societe_id == 0)
{
@ -117,7 +116,7 @@ if ($_POST["action"] == 'add')
$db->begin();
// Creation facture
$facfou = new FactureFourn($db);
$facfou = new FactureFournisseur($db);
$facfou->number = $_POST["facnumber"];
$facfou->socid = $_POST["socidp"];
@ -162,7 +161,7 @@ if ($_POST["action"] == 'add')
if ($_GET["action"] == 'del_ligne')
{
$facfou = new FactureFourn($db,"",$_GET["facid"]);
$facfou = new FactureFournisseur($db,"",$_GET["facid"]);
$facfou->deleteline($_GET["ligne_id"]);
@ -171,7 +170,7 @@ if ($_GET["action"] == 'del_ligne')
if ($_GET["action"] == 'add_ligne')
{
$facfou = new FactureFourn($db,"", $_GET["facid"]);
$facfou = new FactureFournisseur($db,"", $_GET["facid"]);
$facfou->addline($_POST["label"], $_POST["amount"], $_POST["tauxtva"], $_POST["qty"]);
@ -197,7 +196,7 @@ if ($_GET["action"] == 'create' or $_GET["action"] == 'copy')
{
if ($_GET["action"] == 'copy')
{
$fac_ori = new FactureFourn($db);
$fac_ori = new FactureFournisseur($db);
$fac_ori->fetch($_GET["facid"]);
}
print_titre($langs->trans("NewBill"));
@ -292,7 +291,7 @@ else
if ($_GET["facid"] > 0)
{
$fac = new FactureFourn($db);
$fac = new FactureFournisseur($db);
$fac->fetch($_GET["facid"]);
if ($_GET["action"] == "edit")

View File

@ -30,7 +30,6 @@
require("./pre.inc.php");
require("../../contact.class.php");
require("../../facturefourn.class.php");
llxHeader();
@ -47,7 +46,7 @@ if ($user->societe_id > 0)
if ($_GET["action"] == 'delete')
{
$fac = new FactureFourn($db);
$fac = new FactureFournisseur($db);
$fac->delete($_GET["facid"]);
$facid = 0 ;
@ -185,7 +184,7 @@ if ($result)
print "</tr>\n";
print '</form>';
$fac = new FactureFourn($db);
$fac = new FactureFournisseur($db);
$var=true;
while ($i < min($num,$limit))

View File

@ -1,5 +1,5 @@
<?php
/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004 Laurent Destailleur <eldy@users.sourceforge.net>
*
* This program is free software; you can redistribute it and/or modify
@ -22,13 +22,13 @@
*/
/*!
\file htdocs/fourn/facture/pre.inc.php
\ingroup fournisseur,facture
\brief Fichier gestionnaire du menu factures fournisseurs
\file htdocs/fourn/facture/pre.inc.php
\ingroup fournisseur,facture
\brief Fichier gestionnaire du menu factures fournisseurs
*/
require("../../main.inc.php");
require(DOL_DOCUMENT_ROOT."/fournisseur.facture.class.php");
function llxHeader($head = "", $title = "", $addons='') {
global $user, $conf, $langs;

View File

@ -31,7 +31,6 @@
require("./pre.inc.php");
require("../contact.class.php");
require("../facturefourn.class.php");
$langs->load("suppliers");
$langs->load("bills");
@ -227,16 +226,17 @@ if ( $societe->fetch($socid) )
$num = $db->num_rows();
if ($num > 0)
{
print '<table class="border" width="100%">';
print '<table class="border" width="100%">';
print "<tr $bc[$var]>";
print "<td colspan=\"4\">";
print "<table class=\"noborder\" width=\"100%\"><tr><td>".$langs->trans("LastSuppliersBills",min($num,$max))."</td><td align=\"right\"><a href=\"facture/index.php?socid=$societe->id\">".$langs->trans("AllBills")." (".$num.")</td></tr></table>";
print "</td></tr>";
}
while ($i < $num && $i < $max)
{
$obj = $db->fetch_object();
$var=!$var;
$var=!$var;
print "<tr $bc[$var]>";
print '<td>';
@ -244,7 +244,7 @@ if ( $societe->fetch($socid) )
print img_object($langs->trans("ShowBill"),"bill")." ".$obj->facnumber.'</a> '.substr($obj->libelle,0,40).'...</td>';
print "<td align=\"right\" width=\"80\">".dolibarr_print_date($obj->df)."</td>";
print '<td align="right">'.$obj->amount.'</td>';
$fac = new FactureFourn($db);
$fac = new FactureFournisseur($db);
print '<td align="center">'.$fac->LibStatut($obj->paye,$obj->statut).'</td>';
print "</tr>";
$i++;

View File

@ -1,5 +1,5 @@
<?php
/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -21,12 +21,14 @@
*/
/*!
\file htdocs/fourn/pre.inc.php
\ingroup fournisseur,facture
\brief Fichier gestionnaire du menu fournisseurs
\file htdocs/fourn/pre.inc.php
\ingroup fournisseur,facture
\brief Fichier gestionnaire du menu fournisseurs
*/
require("../main.inc.php");
require(DOL_DOCUMENT_ROOT."/fournisseur.facture.class.php");
$user->getrights('fournisseur');
function llxHeader($head = "", $title="", $addons='') {
@ -42,7 +44,6 @@ function llxHeader($head = "", $title="", $addons='') {
if (is_array($addons))
{
//$menu->add($url, $libelle);
$menu->add($addons[0][0], $addons[0][1]);
}