Cleanup

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

diff --git a/reporting/rep107.php b/reporting/rep107.php
index 2c5449445d86c2ff2c102b48c4138da13a92fafb..e3bd2065207de7463d6ea976ae327143362d651c 100644 (file)
--- a/reporting/rep107.php
+++ b/reporting/rep107.php
@@ -73,7 +73,7 @@ function print_invoices()
        {
                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;
@@ -113,6 +113,9 @@ function print_invoices()
                        $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)
                        {