X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep112.php;h=a70b78cb112b47d8fbf33a72b1a53a11fb62e72d;hb=9481e23e6d03f39f7d9e745f86bd1be5f703b96d;hp=10e2130bfd9e542ab93a0b76ca4ad84bfe63e7cc;hpb=5b8f4c4b4aa8cf996bc071f116bfce1273200fa2;p=fa-stable.git

diff --git a/reporting/rep112.php b/reporting/rep112.php
index 10e2130b..a70b78cb 100644
--- a/reporting/rep112.php
+++ b/reporting/rep112.php
@@ -31,18 +31,20 @@ print_receipts();
 //----------------------------------------------------------------------------------------------------
 function get_receipt($type, $trans_no)
 {
-    $sql = "SELECT ".TB_PREF."debtor_trans.*,
-				(".TB_PREF."debtor_trans.ov_amount + ".TB_PREF."debtor_trans.ov_gst + ".TB_PREF."debtor_trans.ov_freight + 
-				".TB_PREF."debtor_trans.ov_freight_tax) AS Total,
-				".TB_PREF."debtor_trans.ov_discount,
-   				".TB_PREF."debtors_master.name AS DebtorName,  ".TB_PREF."debtors_master.debtor_ref,
-   				".TB_PREF."debtors_master.curr_code, ".TB_PREF."debtors_master.payment_terms, "
-   				.TB_PREF."debtors_master.tax_id AS tax_id,
-   				".TB_PREF."debtors_master.address
-    			FROM ".TB_PREF."debtor_trans, ".TB_PREF."debtors_master
-				WHERE ".TB_PREF."debtor_trans.debtor_no = ".TB_PREF."debtors_master.debtor_no
-				AND ".TB_PREF."debtor_trans.type = ".db_escape($type)."
-				AND ".TB_PREF."debtor_trans.trans_no = ".db_escape($trans_no);
+    $sql = "SELECT trans.*,
+				(trans.ov_amount + trans.ov_gst + trans.ov_freight + trans.ov_freight_tax) AS Total,
+				trans.ov_discount, 
+				debtor.name AS DebtorName,
+				debtor.debtor_ref,
+   				debtor.curr_code,
+   				debtor.payment_terms,
+   				debtor.tax_id AS tax_id,
+   				debtor.address
+    			FROM ".TB_PREF."debtor_trans trans,"
+    				.TB_PREF."debtors_master debtor
+				WHERE trans.debtor_no = debtor.debtor_no
+				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;
@@ -83,7 +85,6 @@ function print_receipts()
 	$rep = new FrontReport(_('RECEIPT'), "ReceiptBulk", user_pagesize(), 9, $orientation);
    	if ($orientation == 'L')
     	recalculate_cols($cols);
- 	$rep->SetHeaderType('Header2');
 	$rep->currency = $cur;
 	$rep->Font();
 	$rep->Info($params, $cols, null, $aligns);
@@ -99,12 +100,16 @@ function print_receipts()
 			$myrow = get_receipt($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'];
 
 			$contacts = get_branch_contacts($myrow['branch_code'], 'invoice', $myrow['debtor_no']);
 			$rep->SetCommonData($myrow, null, $myrow, $baccount, ST_CUSTPAYMENT, $contacts);
+ 			$rep->SetHeaderType('Header2');
 			$rep->NewPage();
 			$result = get_allocatable_to_cust_transactions($myrow['debtor_no'], $myrow['trans_no'], $myrow['type']);