Emailed reports can be send to multiply destinations, fixed email charset selection.

[fa-stable.git] / reporting / rep111.php

diff --git a/reporting/rep111.php b/reporting/rep111.php
index a16a1d7fc0efd7fc7e23657804b90aa9542453f1..c5bed8d12f51c738ef94014ad6163f50557b4b9d 100644 (file)
--- a/reporting/rep111.php
+++ b/reporting/rep111.php
@@ -58,6 +58,7 @@ function print_sales_quotations()
        if ($email == 0)
        {
                $rep = new FrontReport(_("SALES QUOTATION"), "SalesQuotationBulk", user_pagesize());
+               $rep->SetHeaderType('Header2');
                $rep->currency = $cur;
                $rep->Font();
                $rep->Info($params, $cols, null, $aligns);
@@ -72,13 +73,16 @@ function print_sales_quotations()
                if ($email == 1)
                {
                        $rep = new FrontReport("", "", user_pagesize());
+                       $rep->SetHeaderType('Header2');
                        $rep->currency = $cur;
                        $rep->Font();
                        $rep->filename = "SalesQuotation" . $i . ".pdf";
                        $rep->Info($params, $cols, null, $aligns);
                }
                $rep->title = _("SALES QUOTATION");
-               $rep->Header2($myrow, $branch, $myrow, $baccount, 7);
+               $rep->SetCommonData($myrow, $branch, $myrow, $baccount, ST_SALESQUOTE);
+               $rep->headerFunc = 'Header2';
+               $rep->NewPage();
 
                $result = get_sales_order_details($i, ST_SALESQUOTE);
                $SubTotal = 0;
@@ -107,7 +111,7 @@ function print_sales_quotations()
                        $rep->row = $newrow;
                        //$rep->NewLine(1);
                        if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
-                               $rep->Header2($myrow, $branch, $myrow, $baccount, 9);
+                               $rep->NewPage();
                }
                if ($myrow['comments'] != "")
                {
@@ -119,15 +123,8 @@ function print_sales_quotations()
 
                $rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
                $linetype = true;
-               $doctype = 9;
-               if ($rep->currency != $myrow['curr_code'])
-               {
-                       include($path_to_root . "/reporting/includes/doctext2.inc");
-               }
-               else
-               {
-                       include($path_to_root . "/reporting/includes/doctext.inc");
-               }
+               $doctype = ST_SALESQUOTE;
+               include($path_to_root . "/reporting/includes/doctext.inc");
 
                $rep->TextCol(3, 6, $doc_Sub_total, -2);
                $rep->TextCol(6, 7,     $DisplaySubTot, -2);
@@ -137,8 +134,17 @@ function print_sales_quotations()
                $rep->NewLine();
                $DisplayTotal = number_format2($myrow["freight_cost"] + $SubTotal, $dec);
                $rep->Font('bold');
-               $rep->TextCol(3, 6, $doc_TOTAL_ORDER, - 2);
+               if ($myrow['tax_included'] == 0)
+                       $rep->TextCol(3, 6, $doc_TOTAL_ORDER, - 2);
+               else    
+                       $rep->TextCol(3, 6, $doc_TOTAL_ORDER2, - 2);
                $rep->TextCol(6, 7,     $DisplayTotal, -2);
+               $words = price_in_words($myrow["freight_cost"] + $SubTotal, ST_SALESQUOTE);
+               if ($words != "")
+               {
+                       $rep->NewLine(1);
+                       $rep->TextCol(1, 7, $myrow['curr_code'] . ": " . $words, - 2);
+               }       
                $rep->Font();
                if ($email == 1)
                {