From 857737fc96503f031b0210f47b60b702f52282bb Mon Sep 17 00:00:00 2001 From: Rodolphe Quiedeville Date: Sat, 6 Sep 2003 14:41:49 +0000 Subject: [PATCH] Gestion de la remise --- .../propale/pdf_propale_rouge.modules.php | 28 +++++++++++++------ 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/htdocs/includes/modules/propale/pdf_propale_rouge.modules.php b/htdocs/includes/modules/propale/pdf_propale_rouge.modules.php index 661480832ed..0b5b62d32fd 100644 --- a/htdocs/includes/modules/propale/pdf_propale_rouge.modules.php +++ b/htdocs/includes/modules/propale/pdf_propale_rouge.modules.php @@ -71,7 +71,7 @@ Class pdf_propale_rouge /* */ $tab_top = 100; - $tab_height = 150; + $tab_height = 140; /* * */ @@ -133,9 +133,9 @@ Class pdf_propale_rouge /* * */ - $tab2_top = 254; + $tab2_top = 241; $tab2_lh = 7; - $tab2_height = $tab2_lh * 3; + $tab2_height = $tab2_lh * 4; $pdf->SetFont('Arial','', 11); @@ -151,20 +151,32 @@ Class pdf_propale_rouge $pdf->MultiCell(42, $tab2_lh, "Total HT", 0, 'R', 0); $pdf->SetXY (132, $tab2_top + $tab2_lh); + $pdf->MultiCell(42, $tab2_lh, "Remise HT", 0, 'R', 0); + + $pdf->SetXY (132, $tab2_top + $tab2_lh*2); + $pdf->MultiCell(42, $tab2_lh, "Total HT aprés remise", 0, 'R', 0); + + $pdf->SetXY (132, $tab2_top + $tab2_lh*3); $pdf->MultiCell(42, $tab2_lh, "Total TVA", 0, 'R', 0); - $pdf->SetXY (132, $tab2_top + ($tab2_lh*2)); + $pdf->SetXY (132, $tab2_top + ($tab2_lh*4)); $pdf->MultiCell(42, $tab2_lh, "Total TTC", 1, 'R', 1); - + $pdf->SetXY (174, $tab2_top + 0); - $pdf->MultiCell(26, $tab2_lh, price($propale->total_ht), 0, 'R', 0); + $pdf->MultiCell(26, $tab2_lh, price($propale->total_ht + $propale->remise), 0, 'R', 0); $pdf->SetXY (174, $tab2_top + $tab2_lh); + $pdf->MultiCell(26, $tab2_lh, price($propale->remise), 0, 'R', 0); + + $pdf->SetXY (174, $tab2_top + $tab2_lh*2); + $pdf->MultiCell(26, $tab2_lh, price($propale->total_ht), 0, 'R', 0); + + $pdf->SetXY (174, $tab2_top + $tab2_lh*3); $pdf->MultiCell(26, $tab2_lh, price($propale->total_tva), 0, 'R', 0); - $pdf->SetXY (174, $tab2_top + ($tab2_lh*2)); + $pdf->SetXY (174, $tab2_top + ($tab2_lh*4)); $pdf->MultiCell(26, $tab2_lh, price($propale->total_ttc), 1, 'R', 1); - + /* * */