From d5869583a5ad844532414a1d6829d2aac9344a36 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 10 Sep 2006 20:18:26 +0000 Subject: [PATCH] Fix: On renomme partout les proprietes tva_taux en tva_tx --- htdocs/commande/commande.class.php | 2 +- htdocs/compta/export/ComptaJournalVente.class.php | 4 ++-- htdocs/compta/facture/facture-rec.class.php | 10 +++++----- htdocs/compta/facture/fiche-rec.php | 2 +- htdocs/facture.class.php | 12 ++++++------ htdocs/fourn/facture/fiche.php | 2 +- htdocs/fourn/fournisseur.facture.class.php | 2 +- htdocs/includes/modules/facture/modules_facture.php | 2 +- .../modules/facture/pdf_bernique.modules.php | 2 +- .../includes/modules/facture/pdf_bulot.modules.php | 2 +- .../includes/modules/facture/pdf_crabe.modules.php | 4 ++-- .../includes/modules/facture/pdf_huitre.modules.php | 2 +- .../includes/modules/facture/pdf_oursin.modules.php | 2 +- htdocs/propal.class.php | 2 +- 14 files changed, 25 insertions(+), 25 deletions(-) diff --git a/htdocs/commande/commande.class.php b/htdocs/commande/commande.class.php index 1f1d4cad5c1..ab1a04191c6 100644 --- a/htdocs/commande/commande.class.php +++ b/htdocs/commande/commande.class.php @@ -2027,7 +2027,7 @@ class Commande extends CommonObject $ligne->qty=1; $ligne->subprice=100; $ligne->price=100; - $ligne->tva_taux=19.6; + $ligne->tva_tx=19.6; $prodid = rand(1, $num_prods); $ligne->produit_id=$prodids[$prodid]; $this->lignes[$xnbp]=$ligne; diff --git a/htdocs/compta/export/ComptaJournalVente.class.php b/htdocs/compta/export/ComptaJournalVente.class.php index 13e656b5b7a..36b6d0b409d 100644 --- a/htdocs/compta/export/ComptaJournalVente.class.php +++ b/htdocs/compta/export/ComptaJournalVente.class.php @@ -68,8 +68,8 @@ class ComptaJournalVente { $nexY = $pdf->GetY(); $sql = "SELECT f.rowid as facid, f.facnumber, ".$this->db->pdate("f.datef")." as dp"; - $sql .= " , f.total_ttc as amount, f.tva "; - $sql .= " ,s.nom, s.code_compta"; + $sql .= " , f.total_ttc as amount, f.tva"; + $sql .= " , s.nom, s.code_compta"; $sql .= " , l.price, l.tva_taux"; $sql .= " , c.numero, f.increment"; $sql .= " , l.rowid as lrowid"; diff --git a/htdocs/compta/facture/facture-rec.class.php b/htdocs/compta/facture/facture-rec.class.php index 873ad652860..ceb0cec5d78 100644 --- a/htdocs/compta/facture/facture-rec.class.php +++ b/htdocs/compta/facture/facture-rec.class.php @@ -119,7 +119,7 @@ class FactureRec extends Facture addslashes($facsrc->lignes[$i]->desc), $facsrc->lignes[$i]->subprice, $facsrc->lignes[$i]->qty, - $facsrc->lignes[$i]->tva_taux, + $facsrc->lignes[$i]->tva_tx, $facsrc->lignes[$i]->produit_id, $facsrc->lignes[$i]->remise_percent); @@ -211,11 +211,11 @@ class FactureRec extends Facture $objp = $this->db->fetch_object($result); $faclig = new FactureLigne($this->db); $faclig->produit_id = $objp->fk_product; - $faclig->desc = stripslashes($objp->description); + $faclig->desc = $objp->description; $faclig->qty = $objp->qty; $faclig->price = $objp->price; - $faclig->subprice = $objp->subprice; - $faclig->tva_taux = $objp->tva_taux; + $faclig->subprice = $objp->subprice; + $faclig->tva_tx = $objp->tva_taux; $faclig->remise_percent = $objp->remise_percent; $this->lignes[$i] = $faclig; $i++; @@ -299,7 +299,7 @@ class FactureRec extends Facture $sql .= ",".price2num($price); $sql .= ",".price2num($qty); $sql .= ",".price2num($txtva); - $sql .= ",'$fk_product'"; + $sql .= ",'".$fk_product."'"; $sql .= ",'".price2num($remise_percent)."'"; $sql .= ",'".price2num($subprice)."'"; $sql .= ",'".price2num($remise)."') ;"; diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index 25fabfa25e3..cc97576c480 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -202,7 +202,7 @@ if ($_GET["action"] == 'create') } else { - print "".stripslashes(nl2br($objp->description))."\n"; + print "".nl2br($objp->description)."\n"; } print ''.$objp->tva_taux.' %'; print ''.$objp->qty.''; diff --git a/htdocs/facture.class.php b/htdocs/facture.class.php index a85c029df67..8f695f1f3f8 100644 --- a/htdocs/facture.class.php +++ b/htdocs/facture.class.php @@ -515,7 +515,7 @@ class Facture extends CommonObject $faclig->product_desc = $objp->product_desc; // Description produit $faclig->qty = $objp->qty; $faclig->subprice = $objp->subprice; - $faclig->tva_taux = $objp->tva_taux; + $faclig->tva_tx = $objp->tva_taux; $faclig->remise_percent = $objp->remise_percent; $faclig->fk_remise_except = $objp->fk_remise_except; $faclig->produit_id = $objp->fk_product; @@ -1458,7 +1458,7 @@ class Facture extends CommonObject $ligne->desc=$desc; $ligne->qty=$qty; - $ligne->tva_taux=$txtva; + $ligne->tva_tx=$txtva; $ligne->remise_percent=$remise_percent; $ligne->subprice=$pu; $ligne->date_start=$date_start; @@ -2554,7 +2554,7 @@ class Facture extends CommonObject $ligne->qty=1; $ligne->subprice=100; $ligne->price=100; - $ligne->tva_taux=19.6; + $ligne->tva_tx=19.6; $prodid = rand(1, $num_prods); $ligne->produit_id=$prodids[$prodid]; $this->lignes[$xnbp]=$ligne; @@ -2588,7 +2588,7 @@ class FactureLigne var $fk_product; // Id produit prédéfini var $qty; // Quantité (exemple 2) - var $tva_taux; // Taux tva produit/service (exemple 19.6) + var $tva_tx; // Taux tva produit/service (exemple 19.6) var $subprice; // P.U. HT (exemple 100) var $remise_percent; // % de la remise ligne (exemple 20%) var $rang = 0; @@ -2648,7 +2648,7 @@ class FactureLigne $this->desc = $objp->description; $this->qty = $objp->qty; $this->subprice = $objp->subprice; - $this->tva_taux = $objp->tva_taux; + $this->tva_tx = $objp->tva_taux; $this->remise_percent = $objp->remise_percent; $this->fk_remise_except = $objp->fk_remise_except; $this->produit_id = $objp->fk_product; @@ -2778,7 +2778,7 @@ class FactureLigne $sql.= ",remise_percent='".price2num($this->remise_percent)."'"; if ($this->fk_remise_except) $sql.= ",fk_remise_except=".$this->fk_remise_except; else $sql.= ",fk_remise_except=null"; - $sql.= ",tva_taux='".price2num($this->tva_taux)."'"; + $sql.= ",tva_taux='".price2num($this->tva_tx)."'"; $sql.= ",qty='".price2num($this->qty)."'"; if ($this->date_start) { $sql.= ",date_start='".$this->date_start."'"; } else { $sql.=',date_start=null'; } diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index dbbbdc3cb44..52d9798f615 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -139,7 +139,7 @@ if ($_POST['action'] == 'add' && $user->rights->fournisseur->facture->creer) $tva = 0; $amo = price2num($_POST['amount']); - $tva = (price2num($_POST['tva_taux']) * $amo) / 100 ; + $tva = (price2num($_POST['tva_tx']) * $amo) / 100 ; $remise = 0; $total = $tva + $amo; diff --git a/htdocs/fourn/fournisseur.facture.class.php b/htdocs/fourn/fournisseur.facture.class.php index b8592e6ac30..9ed2751aa0d 100644 --- a/htdocs/fourn/fournisseur.facture.class.php +++ b/htdocs/fourn/fournisseur.facture.class.php @@ -221,7 +221,7 @@ class FactureFournisseur extends Facture $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][2] = $obj->tva_tx; $this->lignes[$i][3] = $obj->qty; $this->lignes[$i][4] = $obj->total_ht; $this->lignes[$i][5] = $obj->tva; diff --git a/htdocs/includes/modules/facture/modules_facture.php b/htdocs/includes/modules/facture/modules_facture.php index 61600b10f52..2f626470bd9 100644 --- a/htdocs/includes/modules/facture/modules_facture.php +++ b/htdocs/includes/modules/facture/modules_facture.php @@ -241,7 +241,7 @@ TOTAL_TTC=\"" . $fac->total_ttc . "\"\n"; //Pour les articles $meta .= "ITEM_" . $i . "_QUANTITY=\"" . $fac->lignes[$i]->qty . "\" ITEM_" . $i . "_UNIT_PRICE=\"" . $fac->lignes[$i]->price . "\" -ITEM_" . $i . "_TVA=\"" .$fac->lignes[$i]->tva_taux . "\" +ITEM_" . $i . "_TVA=\"" .$fac->lignes[$i]->tva_tx . "\" ITEM_" . $i . "_DESCRIPTION=\"" . str_replace("\r\n","",nl2br($fac->lignes[$i]->desc)) . "\" "; } diff --git a/htdocs/includes/modules/facture/pdf_bernique.modules.php b/htdocs/includes/modules/facture/pdf_bernique.modules.php index add3d68b647..456edf893c5 100644 --- a/htdocs/includes/modules/facture/pdf_bernique.modules.php +++ b/htdocs/includes/modules/facture/pdf_bernique.modules.php @@ -148,7 +148,7 @@ class pdf_bernique extends ModelePDFFactures $nexY = $pdf->GetY(); $pdf->SetXY (133, $curY); - $pdf->MultiCell(10, 5, $fac->lignes[$i]->tva_taux, 0, 'C'); + $pdf->MultiCell(10, 5, $fac->lignes[$i]->tva_tx, 0, 'C'); $pdf->SetXY (145, $curY); $pdf->MultiCell(10, 5, $fac->lignes[$i]->qty, 0, 'C'); diff --git a/htdocs/includes/modules/facture/pdf_bulot.modules.php b/htdocs/includes/modules/facture/pdf_bulot.modules.php index 9a284769d83..55da3cd4008 100644 --- a/htdocs/includes/modules/facture/pdf_bulot.modules.php +++ b/htdocs/includes/modules/facture/pdf_bulot.modules.php @@ -149,7 +149,7 @@ class pdf_bulot extends ModelePDFFactures $nexY = $pdf->GetY(); $pdf->SetXY (133, $curY); - $pdf->MultiCell(10, 5, $fac->lignes[$i]->tva_taux, 0, 'C'); + $pdf->MultiCell(10, 5, $fac->lignes[$i]->tva_tx, 0, 'C'); $pdf->SetXY (145, $curY); $pdf->MultiCell(10, 5, $fac->lignes[$i]->qty, 0, 'C'); diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php index 2dc0ff142a8..f3de992b1f1 100644 --- a/htdocs/includes/modules/facture/pdf_crabe.modules.php +++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php @@ -272,7 +272,7 @@ class pdf_crabe extends ModelePDFFactures // TVA $pdf->SetXY ($this->posxtva, $curY); - $pdf->MultiCell(10, 4, ($fac->lignes[$i]->tva_taux < 0 ? '*':'').abs($fac->lignes[$i]->tva_taux), 0, 'R'); + $pdf->MultiCell(10, 4, ($fac->lignes[$i]->tva_tx < 0 ? '*':'').abs($fac->lignes[$i]->tva_tx), 0, 'R'); // Prix unitaire HT avant remise $pdf->SetXY ($this->posxup, $curY); @@ -298,7 +298,7 @@ class pdf_crabe extends ModelePDFFactures // dans le tableau tva["taux"]=total_tva $tvaligne=$fac->lignes[$i]->price * $fac->lignes[$i]->qty; if ($fac->remise_percent) $tvaligne-=($tvaligne*$fac->remise_percent)/100; - $this->tva[ (string)$fac->lignes[$i]->tva_taux ] += $tvaligne; + $this->tva[ (string)$fac->lignes[$i]->tva_tx ] += $tvaligne; $nexY+=2; // Passe espace entre les lignes diff --git a/htdocs/includes/modules/facture/pdf_huitre.modules.php b/htdocs/includes/modules/facture/pdf_huitre.modules.php index 5eec488c238..4fbcf8d454f 100644 --- a/htdocs/includes/modules/facture/pdf_huitre.modules.php +++ b/htdocs/includes/modules/facture/pdf_huitre.modules.php @@ -162,7 +162,7 @@ class pdf_huitre extends ModelePDFFactures $nexY = $pdf->GetY(); $pdf->SetXY (133, $curY); - $pdf->MultiCell(10, 5, $fac->lignes[$i]->tva_taux, 0, 'C'); + $pdf->MultiCell(10, 5, $fac->lignes[$i]->tva_tx, 0, 'C'); $pdf->SetXY (145, $curY); $pdf->MultiCell(10, 5, $fac->lignes[$i]->qty, 0, 'C'); diff --git a/htdocs/includes/modules/facture/pdf_oursin.modules.php b/htdocs/includes/modules/facture/pdf_oursin.modules.php index acc5d5fc8ce..cbba64a67cb 100644 --- a/htdocs/includes/modules/facture/pdf_oursin.modules.php +++ b/htdocs/includes/modules/facture/pdf_oursin.modules.php @@ -206,7 +206,7 @@ class pdf_oursin extends ModelePDFFactures if ($this->franchise!=1) { $pdf->SetXY ($this->marges['g']+119, $curY); - $pdf->MultiCell(10, 5, $fac->lignes[$i]->tva_taux, 0, 'C'); + $pdf->MultiCell(10, 5, $fac->lignes[$i]->tva_tx, 0, 'C'); } // Prix unitaire HT avant remise $pdf->SetXY ($this->marges['g']+132, $curY); diff --git a/htdocs/propal.class.php b/htdocs/propal.class.php index 41713a03242..6b74fe3d558 100644 --- a/htdocs/propal.class.php +++ b/htdocs/propal.class.php @@ -1981,7 +1981,7 @@ class Propal extends CommonObject $ligne->qty=1; $ligne->subprice=100; $ligne->price=100; - $ligne->tva_taux=19.6; + $ligne->tva_tx=19.6; $prodid = rand(1, $num_prods); $ligne->produit_id=$prodids[$prodid]; $this->lignes[$xnbp]=$ligne;