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

Fix: On renomme partout les proprietes tva_taux en tva_tx

Browse Source
This commit is contained in:
Laurent Destailleur 2006-09-10 20:18:26 +00:00
parent d16d39d88b
commit d5869583a5
14 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/commande/commande.class.php
View File

@ -2027,7 +2027,7 @@ class Commande extends CommonObject
$ligne->qty=1; $ligne->qty=1;
$ligne->subprice=100; $ligne->subprice=100;
$ligne->price=100; $ligne->price=100;
$ligne->tva_taux=19.6; $ligne->tva_tx=19.6;
$prodid = rand(1, $num_prods); $prodid = rand(1, $num_prods);
$ligne->produit_id=$prodids[$prodid]; $ligne->produit_id=$prodids[$prodid];
$this->lignes[$xnbp]=$ligne; $this->lignes[$xnbp]=$ligne;

4
htdocs/compta/export/ComptaJournalVente.class.php
View File

@ -68,8 +68,8 @@ class ComptaJournalVente {
$nexY = $pdf->GetY(); $nexY = $pdf->GetY();
$sql = "SELECT f.rowid as facid, f.facnumber, ".$this->db->pdate("f.datef")." as dp"; $sql = "SELECT f.rowid as facid, f.facnumber, ".$this->db->pdate("f.datef")." as dp";
$sql .= " , f.total_ttc as amount, f.tva "; $sql .= " , f.total_ttc as amount, f.tva";
$sql .= " ,s.nom, s.code_compta"; $sql .= " , s.nom, s.code_compta";
$sql .= " , l.price, l.tva_taux"; $sql .= " , l.price, l.tva_taux";
$sql .= " , c.numero, f.increment"; $sql .= " , c.numero, f.increment";
$sql .= " , l.rowid as lrowid"; $sql .= " , l.rowid as lrowid";

10
htdocs/compta/facture/facture-rec.class.php
View File

@ -119,7 +119,7 @@ class FactureRec extends Facture
addslashes($facsrc->lignes[$i]->desc), addslashes($facsrc->lignes[$i]->desc),
$facsrc->lignes[$i]->subprice, $facsrc->lignes[$i]->subprice,
$facsrc->lignes[$i]->qty, $facsrc->lignes[$i]->qty,
$facsrc->lignes[$i]->tva_taux, $facsrc->lignes[$i]->tva_tx,
$facsrc->lignes[$i]->produit_id, $facsrc->lignes[$i]->produit_id,
$facsrc->lignes[$i]->remise_percent); $facsrc->lignes[$i]->remise_percent);
@ -211,11 +211,11 @@ class FactureRec extends Facture
$objp = $this->db->fetch_object($result); $objp = $this->db->fetch_object($result);
$faclig = new FactureLigne($this->db); $faclig = new FactureLigne($this->db);
$faclig->produit_id = $objp->fk_product; $faclig->produit_id = $objp->fk_product;
$faclig->desc = stripslashes($objp->description); $faclig->desc = $objp->description;
$faclig->qty = $objp->qty; $faclig->qty = $objp->qty;
$faclig->price = $objp->price; $faclig->price = $objp->price;
$faclig->subprice = $objp->subprice; $faclig->subprice = $objp->subprice;
$faclig->tva_taux = $objp->tva_taux; $faclig->tva_tx = $objp->tva_taux;
$faclig->remise_percent = $objp->remise_percent; $faclig->remise_percent = $objp->remise_percent;
$this->lignes[$i] = $faclig; $this->lignes[$i] = $faclig;
$i++; $i++;
@ -299,7 +299,7 @@ class FactureRec extends Facture
$sql .= ",".price2num($price); $sql .= ",".price2num($price);
$sql .= ",".price2num($qty); $sql .= ",".price2num($qty);
$sql .= ",".price2num($txtva); $sql .= ",".price2num($txtva);
$sql .= ",'$fk_product'"; $sql .= ",'".$fk_product."'";
$sql .= ",'".price2num($remise_percent)."'"; $sql .= ",'".price2num($remise_percent)."'";
$sql .= ",'".price2num($subprice)."'"; $sql .= ",'".price2num($subprice)."'";
$sql .= ",'".price2num($remise)."') ;"; $sql .= ",'".price2num($remise)."') ;";

2
htdocs/compta/facture/fiche-rec.php
View File

@ -202,7 +202,7 @@ if ($_GET["action"] == 'create')
} }
else else
{ {
print "<td>".stripslashes(nl2br($objp->description))."</TD>\n"; print "<td>".nl2br($objp->description)."</TD>\n";
} }
print '<TD align="center">'.$objp->tva_taux.' %</TD>'; print '<TD align="center">'.$objp->tva_taux.' %</TD>';
print '<TD align="center">'.$objp->qty.'</TD>'; print '<TD align="center">'.$objp->qty.'</TD>';

12
htdocs/facture.class.php
View File

@ -515,7 +515,7 @@ class Facture extends CommonObject
$faclig->product_desc = $objp->product_desc; // Description produit $faclig->product_desc = $objp->product_desc; // Description produit
$faclig->qty = $objp->qty; $faclig->qty = $objp->qty;
$faclig->subprice = $objp->subprice; $faclig->subprice = $objp->subprice;
$faclig->tva_taux = $objp->tva_taux; $faclig->tva_tx = $objp->tva_taux;
$faclig->remise_percent = $objp->remise_percent; $faclig->remise_percent = $objp->remise_percent;
$faclig->fk_remise_except = $objp->fk_remise_except; $faclig->fk_remise_except = $objp->fk_remise_except;
$faclig->produit_id = $objp->fk_product; $faclig->produit_id = $objp->fk_product;
@ -1458,7 +1458,7 @@ class Facture extends CommonObject
$ligne->desc=$desc; $ligne->desc=$desc;
$ligne->qty=$qty; $ligne->qty=$qty;
$ligne->tva_taux=$txtva; $ligne->tva_tx=$txtva;
$ligne->remise_percent=$remise_percent; $ligne->remise_percent=$remise_percent;
$ligne->subprice=$pu; $ligne->subprice=$pu;
$ligne->date_start=$date_start; $ligne->date_start=$date_start;
@ -2554,7 +2554,7 @@ class Facture extends CommonObject
$ligne->qty=1; $ligne->qty=1;
$ligne->subprice=100; $ligne->subprice=100;
$ligne->price=100; $ligne->price=100;
$ligne->tva_taux=19.6; $ligne->tva_tx=19.6;
$prodid = rand(1, $num_prods); $prodid = rand(1, $num_prods);
$ligne->produit_id=$prodids[$prodid]; $ligne->produit_id=$prodids[$prodid];
$this->lignes[$xnbp]=$ligne; $this->lignes[$xnbp]=$ligne;
@ -2588,7 +2588,7 @@ class FactureLigne
var $fk_product; // Id produit prédéfini var $fk_product; // Id produit prédéfini
var $qty; // Quantité (exemple 2) 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 $subprice; // P.U. HT (exemple 100)
var $remise_percent; // % de la remise ligne (exemple 20%) var $remise_percent; // % de la remise ligne (exemple 20%)
var $rang = 0; var $rang = 0;
@ -2648,7 +2648,7 @@ class FactureLigne
$this->desc = $objp->description; $this->desc = $objp->description;
$this->qty = $objp->qty; $this->qty = $objp->qty;
$this->subprice = $objp->subprice; $this->subprice = $objp->subprice;
$this->tva_taux = $objp->tva_taux; $this->tva_tx = $objp->tva_taux;
$this->remise_percent = $objp->remise_percent; $this->remise_percent = $objp->remise_percent;
$this->fk_remise_except = $objp->fk_remise_except; $this->fk_remise_except = $objp->fk_remise_except;
$this->produit_id = $objp->fk_product; $this->produit_id = $objp->fk_product;
@ -2778,7 +2778,7 @@ class FactureLigne
$sql.= ",remise_percent='".price2num($this->remise_percent)."'"; $sql.= ",remise_percent='".price2num($this->remise_percent)."'";
if ($this->fk_remise_except) $sql.= ",fk_remise_except=".$this->fk_remise_except; if ($this->fk_remise_except) $sql.= ",fk_remise_except=".$this->fk_remise_except;
else $sql.= ",fk_remise_except=null"; 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)."'"; $sql.= ",qty='".price2num($this->qty)."'";
if ($this->date_start) { $sql.= ",date_start='".$this->date_start."'"; } if ($this->date_start) { $sql.= ",date_start='".$this->date_start."'"; }
else { $sql.=',date_start=null'; } else { $sql.=',date_start=null'; }

2
htdocs/fourn/facture/fiche.php
View File

@ -139,7 +139,7 @@ if ($_POST['action'] == 'add' && $user->rights->fournisseur->facture->creer)
$tva = 0; $tva = 0;
$amo = price2num($_POST['amount']); $amo = price2num($_POST['amount']);
$tva = (price2num($_POST['tva_taux']) * $amo) / 100 ; $tva = (price2num($_POST['tva_tx']) * $amo) / 100 ;
$remise = 0; $remise = 0;
$total = $tva + $amo; $total = $tva + $amo;

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

@ -221,7 +221,7 @@ class FactureFournisseur extends Facture
$obj = $this->db->fetch_object(); $obj = $this->db->fetch_object();
$this->lignes[$i][0] = stripslashes($obj->description); $this->lignes[$i][0] = stripslashes($obj->description);
$this->lignes[$i][1] = $obj->pu_ht; $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][3] = $obj->qty;
$this->lignes[$i][4] = $obj->total_ht; $this->lignes[$i][4] = $obj->total_ht;
$this->lignes[$i][5] = $obj->tva; $this->lignes[$i][5] = $obj->tva;

2
htdocs/includes/modules/facture/modules_facture.php
View File

@ -241,7 +241,7 @@ TOTAL_TTC=\"" . $fac->total_ttc . "\"\n";
//Pour les articles //Pour les articles
$meta .= "ITEM_" . $i . "_QUANTITY=\"" . $fac->lignes[$i]->qty . "\" $meta .= "ITEM_" . $i . "_QUANTITY=\"" . $fac->lignes[$i]->qty . "\"
ITEM_" . $i . "_UNIT_PRICE=\"" . $fac->lignes[$i]->price . "\" 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)) . "\" ITEM_" . $i . "_DESCRIPTION=\"" . str_replace("\r\n","",nl2br($fac->lignes[$i]->desc)) . "\"
"; ";
} }

2
htdocs/includes/modules/facture/pdf_bernique.modules.php
View File

@ -148,7 +148,7 @@ class pdf_bernique extends ModelePDFFactures
$nexY = $pdf->GetY(); $nexY = $pdf->GetY();
$pdf->SetXY (133, $curY); $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->SetXY (145, $curY);
$pdf->MultiCell(10, 5, $fac->lignes[$i]->qty, 0, 'C'); $pdf->MultiCell(10, 5, $fac->lignes[$i]->qty, 0, 'C');

2
htdocs/includes/modules/facture/pdf_bulot.modules.php
View File

@ -149,7 +149,7 @@ class pdf_bulot extends ModelePDFFactures
$nexY = $pdf->GetY(); $nexY = $pdf->GetY();
$pdf->SetXY (133, $curY); $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->SetXY (145, $curY);
$pdf->MultiCell(10, 5, $fac->lignes[$i]->qty, 0, 'C'); $pdf->MultiCell(10, 5, $fac->lignes[$i]->qty, 0, 'C');

4
htdocs/includes/modules/facture/pdf_crabe.modules.php
View File

@ -272,7 +272,7 @@ class pdf_crabe extends ModelePDFFactures
// TVA // TVA
$pdf->SetXY ($this->posxtva, $curY); $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 // Prix unitaire HT avant remise
$pdf->SetXY ($this->posxup, $curY); $pdf->SetXY ($this->posxup, $curY);
@ -298,7 +298,7 @@ class pdf_crabe extends ModelePDFFactures
// dans le tableau tva["taux"]=total_tva // dans le tableau tva["taux"]=total_tva
$tvaligne=$fac->lignes[$i]->price * $fac->lignes[$i]->qty; $tvaligne=$fac->lignes[$i]->price * $fac->lignes[$i]->qty;
if ($fac->remise_percent) $tvaligne-=($tvaligne*$fac->remise_percent)/100; 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 $nexY+=2; // Passe espace entre les lignes

2
htdocs/includes/modules/facture/pdf_huitre.modules.php
View File

@ -162,7 +162,7 @@ class pdf_huitre extends ModelePDFFactures
$nexY = $pdf->GetY(); $nexY = $pdf->GetY();
$pdf->SetXY (133, $curY); $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->SetXY (145, $curY);
$pdf->MultiCell(10, 5, $fac->lignes[$i]->qty, 0, 'C'); $pdf->MultiCell(10, 5, $fac->lignes[$i]->qty, 0, 'C');

2
htdocs/includes/modules/facture/pdf_oursin.modules.php
View File

@ -206,7 +206,7 @@ class pdf_oursin extends ModelePDFFactures
if ($this->franchise!=1) if ($this->franchise!=1)
{ {
$pdf->SetXY ($this->marges['g']+119, $curY); $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 // Prix unitaire HT avant remise
$pdf->SetXY ($this->marges['g']+132, $curY); $pdf->SetXY ($this->marges['g']+132, $curY);

2
htdocs/propal.class.php
View File

@ -1981,7 +1981,7 @@ class Propal extends CommonObject
$ligne->qty=1; $ligne->qty=1;
$ligne->subprice=100; $ligne->subprice=100;
$ligne->price=100; $ligne->price=100;
$ligne->tva_taux=19.6; $ligne->tva_tx=19.6;
$prodid = rand(1, $num_prods); $prodid = rand(1, $num_prods);
$ligne->produit_id=$prodids[$prodid]; $ligne->produit_id=$prodids[$prodid];
$this->lignes[$xnbp]=$ligne; $this->lignes[$xnbp]=$ligne;