X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep112.php;h=044b8437d141f754f81239e49c437efb8be08475;hb=7e830126b96477e969fe3b48d9fc0e78f6c1fe00;hp=dd051b1c7f54411859790667b87baf7bc8844e67;hpb=b37623cf1de2cfce6825744557d76475f002321f;p=fa-stable.git

diff --git a/reporting/rep112.php b/reporting/rep112.php
index dd051b1c..044b8437 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);
@@ -47,18 +48,6 @@ function get_receipt($type, $trans_no)
     return db_fetch($result);
 }
 
-function get_allocations_for_receipt($debtor_id, $type, $trans_no)
-{
-	$sql = get_alloc_trans_sql("amt, trans.reference, trans.alloc", "trans.trans_no = alloc.trans_no_to
-		AND trans.type = alloc.trans_type_to
-		AND alloc.trans_no_from=$trans_no
-		AND alloc.trans_type_from=$type
-		AND trans.debtor_no=".db_escape($debtor_id),
-		TB_PREF."cust_allocations as alloc");
-	$sql .= " ORDER BY trans_no";
-	return db_query($sql, "Cannot retreive alloc to transactions");
-}
-
 function print_receipts()
 {
 	global $path_to_root, $systypes_array;
@@ -70,14 +59,14 @@ function print_receipts()
 	$currency = $_POST['PARAM_2'];
 	$comments = $_POST['PARAM_3'];
 
-	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);
 
@@ -94,40 +83,33 @@ function print_receipts()
 	$rep->Font();
 	$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]);
 		else
-			$types = array(ST_BANKDEPOSIT, ST_CUSTPAYMENT, ST_CUSTCREDIT);
+			$types = array(ST_BANKDEPOSIT, ST_CUSTPAYMENT);
 		foreach ($types as $j)
 		{
 			$myrow = get_receipt($j, $i);
 			if (!$myrow)
-				continue;			
-			$baccount = get_default_bank_account($myrow['curr_code']);
-			$params['bankaccount'] = $baccount['id'];
+				continue;
+			$res = get_bank_trans($j, $i);
+			$baccount = db_fetch($res);
+			$params['bankaccount'] = $baccount['bank_act'];
 
 			$rep->title = _('RECEIPT');
-			$rep->SetCommonData($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']);
+			$result = get_allocatable_to_cust_transactions($myrow['debtor_no'], $myrow['trans_no'], $myrow['type']);
 
-			$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");
-			}
 
 			$total_allocated = 0;
-			$rep->TextCol(0, 4,	$doc_Towards, -2);
+			$rep->TextCol(0, 4,	_("As advance / full / part / payment towards:"), -2);
 			$rep->NewLine(2);
-			
+
 			while ($myrow2=db_fetch($result))
 			{
 				$rep->TextCol(0, 1,	$systypes_array[$myrow2['type']], -2);
@@ -144,38 +126,45 @@ function print_receipts()
 					$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, $doc_Total_Allocated, -2);
+			$rep->TextCol(3, 6, _("Total Allocated"), -2);
 			$rep->AmountCol(6, 7, $total_allocated, $dec, -2);
 			$rep->NewLine();
-			$rep->TextCol(3, 6, $doc_Left_To_Allocate, -2);
+			$rep->TextCol(3, 6, _("Left to Allocate"), -2);
 			$rep->AmountCol(6, 7, $myrow['Total'] - $total_allocated, $dec, -2);
 			$rep->NewLine();
 			$rep->Font('bold');
-			$rep->TextCol(3, 6, $doc_Total_Payment, - 2);
+			$rep->TextCol(3, 6, _("TOTAL RECEIPT"), - 2);
 			$rep->AmountCol(6, 7, $myrow['Total'], $dec, -2);
 			$words = price_in_words($myrow['Total'], ST_CUSTPAYMENT);
 			if ($words != "")
 			{
 				$rep->NewLine(1);
 				$rep->TextCol(0, 7, $myrow['curr_code'] . ": " . $words, - 2);
-			}	
+			}
 			$rep->Font();
 			$rep->NewLine();
-			$rep->TextCol(6, 7, $doc_Received, - 2);
+			$rep->TextCol(6, 7, _("Received / Sign"), - 2);
 			$rep->NewLine();
-			$rep->TextCol(0, 2, $doc_by_Cheque, - 2);
+			$rep->TextCol(0, 2, _("By Cash / Cheque* / Draft No."), - 2);
 			$rep->TextCol(2, 4, "______________________________", - 2);
-			$rep->TextCol(4, 5, $doc_Dated, - 2);
+			$rep->TextCol(4, 5, _("Dated"), - 2);
 			$rep->TextCol(5, 6, "__________________", - 2);
 			$rep->NewLine(1);
-			$rep->TextCol(0, 2, $doc_Drawn, - 2);
+			$rep->TextCol(0, 2, _("Drawn on Bank"), - 2);
 			$rep->TextCol(2, 4, "______________________________", - 2);
-			$rep->TextCol(4, 5, $doc_Drawn_Branch, - 2);
+			$rep->TextCol(4, 5, _("Branch"), - 2);
 			$rep->TextCol(5, 6, "__________________", - 2);
 			$rep->TextCol(6, 7, "__________________");
-		}	
+		}
 	}
 	$rep->End();
 }