diff --git a/htdocs/includes/modules/commande/pdf_edison.modules.php b/htdocs/includes/modules/commande/pdf_edison.modules.php index cc92a8b7dcc..60dff8f8750 100644 --- a/htdocs/includes/modules/commande/pdf_edison.modules.php +++ b/htdocs/includes/modules/commande/pdf_edison.modules.php @@ -250,18 +250,12 @@ class pdf_edison extends ModelePDFCommandes $pdf->MultiCell(42, $tab2_lh, $langs->transnoentities("TotalTTC"), 1, 'R', 1); $pdf->SetXY (174, $tab2_top + 0); - $pdf->MultiCell(26, $tab2_lh, price($com->total_ht + $com->remise), 0, 'R', 0); - - $pdf->SetXY (174, $tab2_top + $tab2_lh); - $pdf->MultiCell(26, $tab2_lh, price($com->remise), 0, 'R', 0); - - $pdf->SetXY (174, $tab2_top + $tab2_lh*2); $pdf->MultiCell(26, $tab2_lh, price($com->total_ht), 0, 'R', 0); - $pdf->SetXY (174, $tab2_top + $tab2_lh*3); + $pdf->SetXY (174, $tab2_top + $tab2_lh); $pdf->MultiCell(26, $tab2_lh, price($com->total_tva), 0, 'R', 0); - $pdf->SetXY (174, $tab2_top + ($tab2_lh*4)); + $pdf->SetXY (174, $tab2_top + ($tab2_lh*2)); $pdf->MultiCell(26, $tab2_lh, price($com->total_ttc), 1, 'R', 1); // Pied de page diff --git a/htdocs/includes/modules/commande/pdf_einstein.modules.php b/htdocs/includes/modules/commande/pdf_einstein.modules.php index a420a679023..246b71501d7 100644 --- a/htdocs/includes/modules/commande/pdf_einstein.modules.php +++ b/htdocs/includes/modules/commande/pdf_einstein.modules.php @@ -311,7 +311,6 @@ class pdf_einstein extends ModelePDFCommandes // Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva $tvaligne=$com->lignes[$i]->total_tva; - if ($com->remise_percent) $tvaligne-=($tvaligne*$com->remise_percent)/100; $vatrate=(string) $com->lignes[$i]->tva_tx; if ($com->lignes[$i]->info_bits & 0x01 == 0x01) $vatrate.='*'; $this->tva[$vatrate] += $tvaligne; @@ -834,7 +833,7 @@ class pdf_einstein extends ModelePDFCommandes if ($this->emetteur->url) $carac_emetteur .= ($carac_emetteur ? "\n" : '' ).$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($this->emetteur->url); $pdf->SetFont('Arial','',9); - $pdf->SetXY(12,42); + $pdf->SetXY(12,$posy+7); $pdf->MultiCell(80,4, $carac_emetteur); // Client destinataire