Merged changes up to 2.3.16 into unstable

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

diff --git a/reporting/rep109.php b/reporting/rep109.php
index 3251efcf5cc2bbc068b432eae3dc2e97e9680b0a..1f7270c4840e1c1885d3b013430ee38fea7dede7 100644 (file)
--- a/reporting/rep109.php
+++ b/reporting/rep109.php
@@ -61,6 +61,7 @@ function print_sales_orders()
 
        if ($email == 0)
        {
+
                if ($print_as_quote == 0)
                        $rep = new FrontReport(_("SALES ORDER"), "SalesOrderBulk", user_pagesize(), 9, $orientation);
                else
@@ -76,6 +77,11 @@ function print_sales_orders()
                $params['bankaccount'] = $baccount['id'];
                $branch = get_branch($myrow["branch_code"]);
                if ($email == 1)
+                       $rep = new FrontReport("", "", user_pagesize(), 9, $orientation);
+               $rep->SetHeaderType('Header2');
+               $rep->currency = $cur;
+               $rep->Font();
+               if ($print_as_quote == 1)
                {
                        $rep = new FrontReport("", "", user_pagesize(), 9, $orientation);
                        if ($print_as_quote == 1)
@@ -129,7 +135,7 @@ function print_sales_orders()
                                $rep->TextCol(4, 5,     $DisplayPrice, -2);
                                $rep->TextCol(5, 6,     $DisplayDiscount, -2);
                                $rep->TextCol(6, 7,     $DisplayNet, -2);
-                       }       
+                       }
                        $rep->row = $newrow;
                        //$rep->NewLine(1);
                        if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))