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

Fix: bad verification

Browse Source
This commit is contained in:
Regis Houssin 2009-11-12 07:31:06 +00:00
parent fb51835e6f
commit 7b6dcc73c8
3 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
htdocs/cashdesk/classes/Facturation.class.php
View File

@ -93,9 +93,17 @@ class Facturation {
dol_syslog("ajoutArticle sql=".$sql); dol_syslog("ajoutArticle sql=".$sql);
$resql = $db->query($sql); $resql = $db->query($sql);
$obj = $db->fetch_object($resql); if ($resql)
$vat_rate=$obj->taux; {
//var_dump($vat_rate);exit; $obj = $db->fetch_object($resql);
$vat_rate=$obj->taux;
//var_dump($vat_rate);exit;
}
else
{
dol_print_error($db);
}
// Define part of HT, VAT, TTC // Define part of HT, VAT, TTC
$resultarray=calcul_price_total($this->qte,$this->prix(),$this->remise_percent(),$vat_rate,0,'HT',0); $resultarray=calcul_price_total($this->qte,$this->prix(),$this->remise_percent(),$vat_rate,0,'HT',0);
@ -124,7 +132,7 @@ class Facturation {
$sql.= ", total_ht"; $sql.= ", total_ht";
$sql.= ", total_ttc"; $sql.= ", total_ttc";
$sql.= ") VALUES ("; $sql.= ") VALUES (";
$sql.= ", ".$this->id(); $sql.= $this->id();
$sql.= ", ".$this->qte(); $sql.= ", ".$this->qte();
$sql.= ", ".$this->tva(); $sql.= ", ".$this->tva();
$sql.= ", ".$remise_percent; $sql.= ", ".$remise_percent;
@ -134,7 +142,12 @@ class Facturation {
$sql.= ")"; $sql.= ")";
dol_syslog("ajoutArticle sql=".$sql); dol_syslog("ajoutArticle sql=".$sql);
$db->query($sql); $result = $db->query($sql);
if (!$result)
{
dol_print_error($db);
}
$this->raz(); $this->raz();

2
htdocs/cashdesk/facturation.php
View File

@ -123,7 +123,7 @@ $sql.= " AND t.active = 1";
$sql.= " AND p.code = '".$mysoc->pays_code."'"; $sql.= " AND p.code = '".$mysoc->pays_code."'";
//print $request; //print $request;
$res=$db->query ($sql); $res = $db->query($sql);
if ($res) if ($res)
{ {
while ( $tab = $db->fetch_array($res) ) while ( $tab = $db->fetch_array($res) )

4
htdocs/cashdesk/include/environnement.php
View File

@ -57,13 +57,11 @@ if ($conf->banque->enabled && (empty($conf_fkaccount_cash) || empty($conf_fkacco
{ {
$error.= '<div class="error">Setup of CashDesk module not complete. Bank account not defined</div>'; $error.= '<div class="error">Setup of CashDesk module not complete. Bank account not defined</div>';
} }
// TODO: ajouter gestion stock
/*
if ($conf->stock->enabled && empty($conf_fkentrepot)) if ($conf->stock->enabled && empty($conf_fkentrepot))
{ {
$error.= '<div class="error">Setup of CashDesk module not complete. Warehouse not defined</div>'; $error.= '<div class="error">Setup of CashDesk module not complete. Warehouse not defined</div>';
} }
*/
// Parametres d'affichage // Parametres d'affichage
$conf_taille_listes = 200; // Nombre max de lignes a afficher dans les listes $conf_taille_listes = 200; // Nombre max de lignes a afficher dans les listes
$conf_nbr_car_listes = 60; // Nombre max de caracteres par ligne dans les listes $conf_nbr_car_listes = 60; // Nombre max de caracteres par ligne dans les listes