[0004212] Work Order Entry: fixed error when voided WO refence is reused.

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

diff --git a/reporting/rep210.php b/reporting/rep210.php
index 1d7dbc698d5f6e0d97c81d5e3d90f7386d5c7867..98b4a9b024c232eab641a40e3b7d9fdfbd3188ad 100644 (file)
--- a/reporting/rep210.php
+++ b/reporting/rep210.php
@@ -32,16 +32,18 @@ print_remittances();
 //----------------------------------------------------------------------------------------------------
 function get_remittance($type, $trans_no)
 {
-       $sql = "SELECT ".TB_PREF."supp_trans.*, 
-               (".TB_PREF."supp_trans.ov_amount+".TB_PREF."supp_trans.ov_gst) AS Total,
-               ".TB_PREF."supp_trans.ov_discount,
-               ".TB_PREF."suppliers.supp_name,  ".TB_PREF."suppliers.supp_account_no, 
-               ".TB_PREF."suppliers.curr_code, ".TB_PREF."suppliers.payment_terms, ".TB_PREF."suppliers.gst_no AS tax_id, 
-               ".TB_PREF."suppliers.address
-               FROM ".TB_PREF."supp_trans, ".TB_PREF."suppliers
-               WHERE ".TB_PREF."supp_trans.supplier_id = ".TB_PREF."suppliers.supplier_id
-               AND ".TB_PREF."supp_trans.type = ".db_escape($type)."
-               AND ".TB_PREF."supp_trans.trans_no = ".db_escape($trans_no);
+       $sql = "SELECT trans.*, 
+               (trans.ov_amount+trans.ov_gst) AS Total,
+               trans.ov_discount,
+               supplier.supp_name,  supplier.supp_account_no, 
+               supplier.curr_code, supplier.payment_terms, supplier.gst_no AS tax_id, 
+               supplier.address
+               FROM "
+                       .TB_PREF."supp_trans trans,"
+                       .TB_PREF."suppliers supplier
+               WHERE trans.supplier_id = supplier.supplier_id
+               AND trans.type = ".db_escape($type)."
+               AND trans.trans_no = ".db_escape($trans_no);
        $result = db_query($sql, "The remittance cannot be retrieved");
        if (db_num_rows($result) == 0)
                return false;
@@ -96,6 +98,9 @@ function print_remittances()
                        $myrow = get_remittance($j, $i);
                        if (!$myrow)
                                continue;
+                       if ($currency != ALL_TEXT && $myrow['curr_code'] != $currency) {
+                               continue;
+                       }
                        $res = get_bank_trans($j, $i);
                        $baccount = db_fetch($res);
                        $params['bankaccount'] = $baccount['bank_act'];
@@ -106,13 +111,13 @@ function print_remittances()
                                $rep->title = _('REMITTANCE');
                                $rep->filename = "Remittance" . $i . ".pdf";
                        }
-                       $rep->SetHeaderType('Header2');
                        $rep->currency = $cur;
                        $rep->Font();
                        $rep->Info($params, $cols, null, $aligns);
 
                        $contacts = get_supplier_contacts($myrow['supplier_id'], 'invoice');
                        $rep->SetCommonData($myrow, null, $myrow, $baccount, ST_SUPPAYMENT, $contacts);
+                       $rep->SetHeaderType('Header2');
                        $rep->NewPage();
                        $result = get_allocatable_to_supp_transactions($myrow['supplier_id'], $myrow['trans_no'], $myrow['type']);