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

Nettoyage code

Browse Source
This commit is contained in:
Laurent Destailleur 2008-02-18 04:42:18 +00:00
parent 8c18002659
commit 352e6c0a36
2 changed files with 80 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/facture.class.php
View File

@ -586,7 +586,7 @@ class Facture extends CommonObject
else else
{ {
$this->error=$this->db->error(); $this->error=$this->db->error();
dolibarr_syslog('Facture::fetch_lines: Error '.$this->error); dolibarr_syslog('Facture::fetch_lines: Error '.$this->error,LOG_ERR);
return -3; return -3;
} }
} }

73
htdocs/fourn/fournisseur.facture.class.php
View File

@ -166,6 +166,7 @@ class FactureFournisseur extends Facture
/** /**
* \brief Recupére l'objet facture et ses lignes de factures * \brief Recupére l'objet facture et ses lignes de factures
* \param rowid id de la facture a récupérer * \param rowid id de la facture a récupérer
* \return int >0 si ok, <0 si ko
*/ */
function fetch($rowid) function fetch($rowid)
{ {
@ -213,6 +214,39 @@ class FactureFournisseur extends Facture
/* /*
* Lignes * Lignes
*/ */
$result=$this->fetch_lines();
if ($result < 0)
{
$this->error=$this->db->error();
dolibarr_syslog('Facture::Fetch Error '.$this->error);
return -3;
}
return 1;
}
else
{
dolibarr_syslog('FactureFournisseur::Fetch rowid='.$rowid.' numrows=0 sql='.$sql);
$this->error='Bill with id '.$rowid.' not found sql='.$sql;
dolibarr_print_error($this->db);
return -2;
}
}
else
{
dolibarr_syslog('FactureFournisseur::Fetch rowid='.$rowid.' Erreur dans fetch de la facture fournisseur');
$this->error=$this->db->error();
dolibarr_print_error($this->db);
return -1;
}
}
/**
\brief Recupére les lignes de factures dans this->lignes
\return int 1 si ok, < 0 si erreur
*/
function fetch_lines()
{
$sql = 'SELECT f.rowid, f.description, f.pu_ht, f.pu_ttc, f.qty, f.tva_taux, f.tva'; $sql = 'SELECT f.rowid, f.description, f.pu_ht, f.pu_ttc, f.qty, f.tva_taux, f.tva';
$sql.= ', f.total_ht, f.tva as total_tva, f.total_ttc, f.fk_product, f.product_type'; $sql.= ', f.total_ht, f.tva as total_tva, f.total_ttc, f.fk_product, f.product_type';
$sql.= ', p.ref, p.label as label, p.description as product_desc'; $sql.= ', p.ref, p.label as label, p.description as product_desc';
@ -222,7 +256,7 @@ class FactureFournisseur extends Facture
//$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_fournisseur as pf ON f.fk_product = pf.fk_product'; //$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_fournisseur as pf ON f.fk_product = pf.fk_product';
$sql.= ' WHERE fk_facture_fourn='.$this->id; $sql.= ' WHERE fk_facture_fourn='.$this->id;
dolibarr_syslog("FactureFourn::Fetch search lines sql=".$sql, LOG_DEBUG); dolibarr_syslog("FactureFourn::fetch_lines sql=".$sql, LOG_DEBUG);
$resql_rows = $this->db->query($sql); $resql_rows = $this->db->query($sql);
if ($resql_rows) if ($resql_rows)
{ {
@ -253,32 +287,16 @@ class FactureFournisseur extends Facture
} }
} }
$this->db->free($resql_rows); $this->db->free($resql_rows);
return 1;
} }
else else
{ {
dolibarr_syslog('FactureFournisseur::Fetch rowid='.$rowid.', Erreur dans fetch des lignes');
$this->error=$this->db->error(); $this->error=$this->db->error();
dolibarr_print_error($this->db); dolibarr_syslog('FactureFournisseur::fetch_lines: Error '.$this->error,LOG_ERR);
return -3; return -3;
} }
} }
else
{
dolibarr_syslog('FactureFournisseur::Fetch rowid='.$rowid.' numrows=0 sql='.$sql);
$this->error='Bill with id '.$rowid.' not found sql='.$sql;
dolibarr_print_error($this->db);
return -2;
}
}
else
{
dolibarr_syslog('FactureFournisseur::Fetch rowid='.$rowid.' Erreur dans fetch de la facture fournisseur');
$this->error=$this->db->error();
dolibarr_print_error($this->db);
return -1;
}
return 1;
}
/** /**
* \brief Recupére l'objet fournisseur lié à la facture * \brief Recupére l'objet fournisseur lié à la facture
@ -297,24 +315,33 @@ class FactureFournisseur extends Facture
*/ */
function delete($rowid) function delete($rowid)
{ {
$this->db->begin();
$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn_det WHERE fk_facture_fourn = '.$rowid.';'; $sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn_det WHERE fk_facture_fourn = '.$rowid.';';
dolibarr_syslog("FactureFournisseur sql=".$sql);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) if ($resql)
{ {
$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn WHERE rowid = '.$rowid.' AND fk_statut = 0;'; $sql = 'DELETE FROM '.MAIN_DB_PREFIX.'facture_fourn WHERE rowid = '.$rowid.' AND fk_statut = 0';
dolibarr_syslog("FactureFournisseur sql=".$sql);
$resql2 = $this->db->query($sql); $resql2 = $this->db->query($sql);
if ($resql2) if ($resql2)
{ {
$this->db->commit();
return 1; return 1;
} }
else else
{ {
dolibarr_print_error($this->db); $this->db->rollback();
$this->error=$this->db->lasterror();
dolibarr_syslog("FactureFournisseur::delete ".$this->error);
} }
} }
else else
{ {
dolibarr_print_error($this->db); $this->db->rollback();
$this->error=$this->db->lasterror();
dolibarr_syslog("FactureFournisseur::delete ".$this->error);
} }
} }