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

Ajout remontee d'erreur

Browse Source
This commit is contained in:
Rodolphe Quiedeville 2007-07-11 11:01:55 +00:00
parent 76dfbcfedc
commit f23005b0c7
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/telephonie/communication.class.php
View File

@ -1,5 +1,5 @@
<?PHP <?PHP
/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2005-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
@ -29,13 +29,14 @@ class CommunicationTelephonique {
var $dest; var $dest;
var $numero; var $numero;
var $montant; var $montant;
var $messages;
/** /**
* Constructeur * Constructeur
* *
*/ */
function CommunicationTelephonique() function CommunicationTelephonique()
{ {
$this->messages = array();
return 1; return 1;
} }
@ -103,12 +104,14 @@ class CommunicationTelephonique {
if ($tarif_achat->cout($num, $this->cout_temp_achat, $this->cout_fixe_achat, $tarif_libelle_achat) == 0) if ($tarif_achat->cout($num, $this->cout_temp_achat, $this->cout_fixe_achat, $tarif_libelle_achat) == 0)
{ {
dolibarr_syslog("CommunicationTelephonique::Cout Tarif achat manquant pour $num"); dolibarr_syslog("CommunicationTelephonique::Cout Tarif achat manquant pour $num");
array_push($this->messages, array('warning',"Tarif achat manquant pour le numero $num"));
//$error++; //$error++;
} }
if ($tarif_vente->cout($num, $this->cout_temp_vente, $this->cout_fixe_vente, $this->tarif_libelle_vente) == 0) if ($tarif_vente->cout($num, $this->cout_temp_vente, $this->cout_fixe_vente, $this->tarif_libelle_vente) == 0)
{ {
dolibarr_syslog("CommunicationTelephonique::Cout Tarif vente manquant pour $num"); dolibarr_syslog("CommunicationTelephonique::Cout Tarif vente manquant pour $num");
array_push($this->messages, array('error',"Tarif vente manquant pour le numero $num"));
$error++; $error++;
} }
} }

20
htdocs/telephonie/facturation/FacturationCalcul.class.php
View File

@ -88,7 +88,7 @@ class FacturationCalcul {
$num = $this->db->num_rows($resql); $num = $this->db->num_rows($resql);
$row = $this->db->fetch_row($resql); $row = $this->db->fetch_row($resql);
dolibarr_syslog("FacturationCalcul Communications à traiter ".$row[0]); dolibarr_syslog("FacturationCalcul::Calcul Communications à traiter ".$row[0],LOG_INFO);
$this->db->free($resql); $this->db->free($resql);
} }
else else
@ -276,11 +276,11 @@ class FacturationCalcul {
$total_vente = 0; $total_vente = 0;
$total_fourn = 0; $total_fourn = 0;
if ($this->_calcul_facture($this->db, $ligne, $facid, $total_achat, $total_vente, $total_fourn) <> 0) if ($this->CalculateBill($this->db, $ligne, $facid, $total_achat, $total_vente, $total_fourn) <> 0)
{ {
$error++; $error++;
dolibarr_syslog("FacturationCalcul Erreur de calcul de la facture pour la ligne $line_key $ligne->numero"); dolibarr_syslog("FacturationCalcul Erreur de calcul de la facture pour la ligne $line_key $ligne->numero");
array_push($this->messages, "Erreur de calcul de la facture pour la ligne $line_key $ligne->numero"); array_push($this->messages, array('error',"Erreur de calcul de la facture pour la ligne $ligne->numero (id=$line_key)"));
} }
} }
@ -434,7 +434,7 @@ class FacturationCalcul {
* *
******************************************************************************/ ******************************************************************************/
function _calcul_facture($db, $ligne, $facture_id, &$total_cout_achat, &$total_cout_vente, &$total_cout_fourn) function CalculateBill($db, $ligne, $facture_id, &$total_cout_achat, &$total_cout_vente, &$total_cout_fourn)
{ {
$error = 0; $error = 0;
@ -471,7 +471,7 @@ class FacturationCalcul {
$db->free($resql); $db->free($resql);
} }
dolibarr_syslog("FacturationCalcul::_calcul_facture Utilisation du tarif ".$tarif_spec." pour la ligne ".$ligne->id); dolibarr_syslog("FacturationCalcul::CalculateBill Utilisation du tarif ".$tarif_spec." pour la ligne ".$ligne->id);
$tarif_achat = new TelephonieTarif($db, $tarif_spec, "achat", $fournisseur_id); $tarif_achat = new TelephonieTarif($db, $tarif_spec, "achat", $fournisseur_id);
$tarif_vente = new TelephonieTarif($db, $tarif_spec, "vente", $tarif_spec, $ligne->client_comm_id); $tarif_vente = new TelephonieTarif($db, $tarif_spec, "vente", $tarif_spec, $ligne->client_comm_id);
@ -519,7 +519,7 @@ class FacturationCalcul {
else else
{ {
$error++; $error++;
dolibarr_syslog("FacturationCalcul::_calcul_facture Erreur dans Calcul() Problème SQL"); dolibarr_syslog("FacturationCalcul::CalculateBill Erreur dans Calcul() Problème SQL");
} }
for ($ii = 0 ; $ii < $num_sql ; $ii++) for ($ii = 0 ; $ii < $num_sql ; $ii++)
@ -533,8 +533,16 @@ class FacturationCalcul {
$total_cout_vente = $total_cout_vente + $comm->cout_vente; $total_cout_vente = $total_cout_vente + $comm->cout_vente;
$error = $error + $comm->logsql($db); $error = $error + $comm->logsql($db);
foreach ($comm->messages as $message)
{
array_push($this->messages, $message);
}
} }
dolibarr_syslog("FacturationCalcul::CalculateBill return $error", LOG_DEBUG);
return $error; return $error;
} }