Merging changes form main trunk 2.2.5-2.2.6

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

diff --git a/reporting/rep107.php b/reporting/rep107.php
index a265bd603a69c9442ff3f5ad4fb38c427628d405..e3bd2065207de7463d6ea976ae327143362d651c 100644 (file)
--- a/reporting/rep107.php
+++ b/reporting/rep107.php
@@ -39,10 +39,9 @@ function print_invoices()
        $from = $_POST['PARAM_0'];
        $to = $_POST['PARAM_1'];
        $currency = $_POST['PARAM_2'];
-       $bankaccount = $_POST['PARAM_3'];
-       $email = $_POST['PARAM_4'];
-       $paylink = $_POST['PARAM_5'];
-       $comments = $_POST['PARAM_6'];
+       $email = $_POST['PARAM_3'];
+       $paylink = $_POST['PARAM_4'];
+       $comments = $_POST['PARAM_5'];
 
        if ($from == null)
                $from = 0;
@@ -58,10 +57,8 @@ function print_invoices()
        // $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)
@@ -74,18 +71,21 @@ function print_invoices()
 
        for ($i = $fno[0]; $i <= $tno[0]; $i++)
        {
-               for ($j = 10; $j <= 11; $j++)
+               for ($j = ST_SALESINVOICE; $j <= ST_CUSTCREDIT; $j++)
                {
-                       if (isset($_POST['PARAM_7']) && $_POST['PARAM_7'] != $j)
+                       if (isset($_POST['PARAM_6']) && $_POST['PARAM_6'] != $j)
                                continue;
                        if (!exists_customer_trans($j, $i))
                                continue;
-                       $sign = $j==10 ? 1 : -1;
+                       $sign = $j==ST_SALESINVOICE ? 1 : -1;
                        $myrow = get_customer_trans($i, $j);
+                       $baccount = get_default_bank_account($myrow['curr_code']);
+                       $params['bankaccount'] = $baccount['id'];
+
                        $branch = get_branch($myrow["branch_code"]);
                        $branch['disable_branch'] = $paylink; // helper
-                       if ($j == 10)
-                               $sales_order = get_sales_order_header($myrow["order_"], 30);
+                       if ($j == ST_SALESINVOICE)
+                               $sales_order = get_sales_order_header($myrow["order_"], ST_SALESORDER);
                        else
                                $sales_order = null;
                        if ($email == 1)
@@ -93,7 +93,7 @@ function print_invoices()
                                $rep = new FrontReport("", "", user_pagesize());
                                $rep->currency = $cur;
                                $rep->Font();
-                               if ($j == 10)
+                               if ($j == ST_SALESINVOICE)
                                {
                                        $rep->title = _('INVOICE');
                                        $rep->filename = "Invoice" . $myrow['reference'] . ".pdf";
@@ -106,13 +106,16 @@ function print_invoices()
                                $rep->Info($params, $cols, null, $aligns);
                        }
                        else
-                               $rep->title = ($j == 10) ? _('INVOICE') : _('CREDIT NOTE');
+                               $rep->title = ($j == ST_SALESINVOICE) ? _('INVOICE') : _('CREDIT NOTE');
                        $rep->Header2($myrow, $branch, $sales_order, $baccount, $j);
 
                        $result = get_customer_trans_details($j, $i);
                        $SubTotal = 0;
                        while ($myrow2=db_fetch($result))
                        {
+                               if ($myrow2["quantity"] == 0)
+                                       continue;
+                                       
                                $Net = round2($sign * ((1 - $myrow2["discount_percent"]) * $myrow2["unit_price"] * $myrow2["quantity"]),
                                   user_price_dec());
                                $SubTotal += $Net;
@@ -192,6 +195,12 @@ function print_invoices()
                        $rep->Font('bold');
                        $rep->TextCol(3, 6, $doc_TOTAL_INVOICE, - 2);
                        $rep->TextCol(6, 7, $DisplayTotal, -2);
+                       $words = price_in_words($myrow['Total'], $j);
+                       if ($words != "")
+                       {
+                               $rep->NewLine(1);
+                               $rep->TextCol(1, 7, $myrow['curr_code'] . ": " . $words, - 2);
+                       }       
                        $rep->Font();
                        if ($email == 1)
                        {