A final fix for report Inventory Purchasing Report. With help from forum use chrison.

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

diff --git a/reporting/rep210.php b/reporting/rep210.php
index 2c94b3d333580c81671e900ea2207e775cb24a04..136f0d2c9fe355b542fc8dd06cbad64d5f112d27 100644 (file)
--- a/reporting/rep210.php
+++ b/reporting/rep210.php
@@ -71,14 +71,14 @@ function print_remittances()
        $email = $_POST['PARAM_3'];
        $comments = $_POST['PARAM_4'];
 
-       if ($from == null)
-               $from = 0;
-       if ($to == null)
-               $to = 0;
+       if (!$from || !$to) return;
+
        $dec = user_price_dec();
 
        $fno = explode("-", $from);
        $tno = explode("-", $to);
+       $from = min($fno[0], $tno[0]);
+       $to = max($fno[0], $tno[0]);
 
        $cols = array(4, 85, 150, 225, 275, 360, 450, 515);
 
@@ -98,7 +98,7 @@ function print_remittances()
                $rep->Info($params, $cols, null, $aligns);
        }
 
-       for ($i = $fno[0]; $i <= $tno[0]; $i++)
+       for ($i = $from; $i <= $to; $i++)
        {
                if ($fno[0] == $tno[0])
                        $types = array($fno[1]);
@@ -109,8 +109,9 @@ function print_remittances()
                        $myrow = get_remittance($j, $i);
                        if (!$myrow)
                                continue;                       
-                       $baccount = get_default_bank_account($myrow['curr_code']);
-                       $params['bankaccount'] = $baccount['id'];
+                       $res = get_bank_trans($j, $i);
+                       $baccount = db_fetch($res);
+                       $params['bankaccount'] = $baccount['bank_act'];
 
                        if ($email == 1)
                        {
@@ -151,6 +152,12 @@ function print_remittances()
                                        $rep->NewPage();
                        }
 
+                       $memo = get_comments_string($j, $i);
+                       if ($memo != "")
+                       {
+                               $rep->NewLine();
+                               $rep->TextColLines(1, 5, $memo, -2);
+                       }
                        $rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
 
                        $rep->TextCol(3, 6, _("Total Allocated"), -2);
@@ -173,7 +180,7 @@ function print_remittances()
                        if ($email == 1)
                        {
                                $myrow['DebtorName'] = $myrow['supp_name'];
-                               $rep->End($email, '', $myrow);
+                               $rep->End($email);
                        }
                }       
        }