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

Modif calcul TVA

Browse Source
This commit is contained in:
Rodolphe Quiedeville 2004-07-19 08:58:07 +00:00
parent 1bb4e7c375
commit 7f90fe7295
1 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
htdocs/facturefourn.class.php
View File

@ -301,21 +301,20 @@ class FactureFourn
*/ */
Function updateline($id, $label, $puht, $tauxtva, $qty=1) Function updateline($id, $label, $puht, $tauxtva, $qty=1)
{ {
$puht = ereg_replace(",",".",$puht); if (is_numeric($puht) && is_numeric($qty))
{
$totalht = $puht * $qty; $totalht = ($puht * $qty);
$tva = ($totalht * $tauxtva / 100); $tva = ($totalht * $tauxtva / 100);
$totalttc = $totalht + $tva; $totalttc = $totalht + $tva;
$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn_det "; $sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn_det ";
$sql .= "SET description ='".$label."'"; $sql .= "SET description ='".$label."'";
$sql .= ", pu_ht = '$puht'"; $sql .= ", pu_ht = " .ereg_replace(",",".",$puht);
$sql .= ", qty ='$qty'"; $sql .= ", qty =" .ereg_replace(",",".",$qty);
$sql .= ", total_ht='$totalht'"; $sql .= ", total_ht=" .ereg_replace(",",".",$totalht);
$sql .= ", tva='$tva'"; $sql .= ", tva=" .ereg_replace(",",".",$tva);
$sql .= ", tva_taux='$tauxtva'"; $sql .= ", tva_taux=" .ereg_replace(",",".",$tauxtva);
$sql .= ", total_ttc='$totalttc'"; $sql .= ", total_ttc=".ereg_replace(",",".",$totalttc);
$sql .= " WHERE rowid = $id"; $sql .= " WHERE rowid = $id";
@ -327,6 +326,7 @@ class FactureFourn
// Mise a jour prix facture // Mise a jour prix facture
$this->updateprice($this->id); $this->updateprice($this->id);
} }
}
/** /**
* Supprime une ligne de la facture * Supprime une ligne de la facture
* *
@ -382,7 +382,10 @@ class FactureFourn
} }
$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn SET total_ht = '$total_ht', total_tva = '$total_tva', total_ttc = '$total_ttc'"; $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 ;"; $sql .= " WHERE rowid = $facid ;";
$result = $this->db->query($sql); $result = $this->db->query($sql);