X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep112.php;fp=reporting%2Frep112.php;h=b5238a2673769c14432e0dec3df9af9d55443976;hb=46c5f7a65a7659a44ae8254c63152074363d3987;hp=87d87ce5881e3b3f6486c3364399a07a438b4c29;hpb=35f482e2a9246960de37e5f1d975c734e08951e6;p=fa-stable.git

diff --git a/reporting/rep112.php b/reporting/rep112.php
index 87d87ce5..b5238a26 100644
--- a/reporting/rep112.php
+++ b/reporting/rep112.php
@@ -16,7 +16,7 @@ $page_security = $_POST['PARAM_0'] == $_POST['PARAM_1'] ?
 // $ Revision:	2.0 $
 // Creator:	Joe Hunt
 // date_:	2005-05-19
-// Title:	Purchase Orders
+// Title:	Receipts
 // ----------------------------------------------------------------
 $path_to_root="..";
 
@@ -35,9 +35,10 @@ function get_receipt($type, $trans_no)
 				(".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 + ".TB_PREF."debtor_trans.ov_discount) AS Total, 
    				".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.email, ".TB_PREF."debtors_master.address
-    			FROM ".TB_PREF."debtor_trans, ".TB_PREF."debtors_master 
+   				".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);
@@ -89,6 +90,7 @@ function print_receipts()
 	$cur = get_company_Pref('curr_default');
 
 	$rep = new FrontReport(_('RECEIPT'), "ReceiptBulk", user_pagesize());
+	$rep->SetHeaderType('Header2');
 	$rep->currency = $cur;
 	$rep->Font();
 	$rep->Info($params, $cols, null, $aligns);
@@ -108,19 +110,14 @@ function print_receipts()
 			$params['bankaccount'] = $baccount['id'];
 
 			$rep->title = _('RECEIPT');
-			$rep->Header2($myrow, null, $myrow, $baccount, ST_CUSTPAYMENT);
+			$contacts = get_branch_contacts($myrow['branch_code'], 'invoice', $myrow['debtor_no']);
+			$rep->SetCommonData($myrow, null, $myrow, $baccount, ST_CUSTPAYMENT, $contacts);
+			$rep->NewPage();
 			$result = get_allocations_for_receipt($myrow['debtor_no'], $myrow['type'], $myrow['trans_no']);
 
 			$linetype = true;
 			$doctype = ST_CUSTPAYMENT;
-			if ($rep->currency != $myrow['curr_code'])
-			{
-				include($path_to_root . "/reporting/includes/doctext2.inc");
-			}
-			else
-			{
-				include($path_to_root . "/reporting/includes/doctext.inc");
-			}
+			include($path_to_root . "/reporting/includes/doctext.inc");
 
 			$total_allocated = 0;
 			$rep->TextCol(0, 4,	$doc_Towards, -2);
@@ -139,7 +136,7 @@ function print_receipts()
 				$total_allocated += $myrow2['amt'];
 				$rep->NewLine(1);
 				if ($rep->row < $rep->bottomMargin + (15 * $rep->lineHeight))
-					$rep->Header2($myrow, null, $myrow, $baccount, ST_CUSTPAYMENT);
+					$rep->NewPage();
 			}
 
 			$rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);