Rerun. Reports checked for warnings.

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

diff --git a/reporting/rep109.php b/reporting/rep109.php
index 31a769df1114bb1ff4dc68558119897c2bd8d621..2c3bb116e54e4c3ad0c8fc9c1d0b694e17dc1608 100644 (file)
--- a/reporting/rep109.php
+++ b/reporting/rep109.php
@@ -9,7 +9,8 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
-$page_security = 2;
+$page_security = $_POST['PARAM_0'] == $_POST['PARAM_1'] ?
+       'SA_SALESTRANSVIEW' : 'SA_SALESBULKREP';
 // ----------------------------------------------------------------
 // $ Revision: 2.0 $
 // Creator:    Joe Hunt
@@ -38,10 +39,9 @@ function print_sales_orders()
        $from = $_POST['PARAM_0'];
        $to = $_POST['PARAM_1'];
        $currency = $_POST['PARAM_2'];
-       $bankaccount = $_POST['PARAM_3'];
-       $email = $_POST['PARAM_4'];
-       $print_as_quote = $_POST['PARAM_5'];
-       $comments = $_POST['PARAM_6'];
+       $email = $_POST['PARAM_3'];
+       $print_as_quote = $_POST['PARAM_4'];
+       $comments = $_POST['PARAM_5'];
 
        if ($from == null)
                $from = 0;
@@ -54,10 +54,8 @@ function print_sales_orders()
        // $headers in doctext.inc
        $aligns = array('left', 'left', 'right', 'left', 'right', 'right', 'right');
 
-       $params = array('comments' => $comments,
-                                       'bankaccount' => $bankaccount);
+       $params = array('comments' => $comments);
 
-       $baccount = get_bank_account($params['bankaccount']);
        $cur = get_company_Pref('curr_default');
 
        if ($email == 0)
@@ -73,7 +71,9 @@ function print_sales_orders()
 
        for ($i = $from; $i <= $to; $i++)
        {
-               $myrow = get_sales_order_header($i);
+               $myrow = get_sales_order_header($i, ST_SALESORDER);
+               $baccount = get_default_bank_account($myrow['curr_code']);
+               $params['bankaccount'] = $baccount['id'];
                $branch = get_branch($myrow["branch_code"]);
                if ($email == 1)
                {
@@ -94,9 +94,9 @@ function print_sales_orders()
                }
                else
                        $rep->title = ($print_as_quote==1 ? _("QUOTE") : _("SALES ORDER"));
-               $rep->Header2($myrow, $branch, $myrow, $baccount, 9);
+               $rep->Header2($myrow, $branch, $myrow, $baccount, ST_SALESORDER);
 
-               $result = get_sales_order_details($i);
+               $result = get_sales_order_details($i, ST_SALESORDER);
                $SubTotal = 0;
                while ($myrow2=db_fetch($result))
                {
@@ -123,7 +123,7 @@ function print_sales_orders()
                        $rep->row = $newrow;
                        //$rep->NewLine(1);
                        if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
-                               $rep->Header2($myrow, $branch, $myrow, $baccount, 9);
+                               $rep->Header2($myrow, $branch, $myrow, $baccount, ST_SALESORDER);
                }
                if ($myrow['comments'] != "")
                {
@@ -135,7 +135,7 @@ function print_sales_orders()
 
                $rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
                $linetype = true;
-               $doctype = 9;
+               $doctype = ST_SALESORDER;
                if ($rep->currency != $myrow['curr_code'])
                {
                        include($path_to_root . "/reporting/includes/doctext2.inc");
@@ -153,8 +153,17 @@ function print_sales_orders()
                $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_SALESORDER);
+               if ($words != "")
+               {
+                       $rep->NewLine(1);
+                       $rep->TextCol(1, 7, $myrow['curr_code'] . ": " . $words, - 2);
+               }       
                $rep->Font();
                if ($email == 1)
                {
@@ -165,7 +174,7 @@ function print_sales_orders()
                                        $myrow['contact_email'] = $myrow['master_email'];
                                $myrow['DebtorName'] = $branch['br_name'];
                        }
-                       $myrow['reference'] = $i;
+                       //$myrow['reference'] = $i;
                        $rep->End($email, $doc_Invoice_no . " " . $i, $myrow);
                }
        }