X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep112.php;h=6cb3148fa292df4ba18e43afb0dcf8b7ca5c639a;hb=33dfc21a26f08e9ac19048bbcf80cce2351a6cfe;hp=044b8437d141f754f81239e49c437efb8be08475;hpb=264c09696d65efe4532c197f317162daf8c24f32;p=fa-stable.git

diff --git a/reporting/rep112.php b/reporting/rep112.php
index 044b8437..6cb3148f 100644
--- a/reporting/rep112.php
+++ b/reporting/rep112.php
@@ -33,7 +33,8 @@ 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 + ".TB_PREF."debtor_trans.ov_discount) AS Total, 
+				".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,
@@ -58,9 +59,11 @@ function print_receipts()
 	$to = $_POST['PARAM_1'];
 	$currency = $_POST['PARAM_2'];
 	$comments = $_POST['PARAM_3'];
+	$orientation = $_POST['PARAM_4'];
 
 	if (!$from || !$to) return;
 
+	$orientation = ($orientation ? 'L' : 'P');
 	$dec = user_price_dec();
 
  	$fno = explode("-", $from);
@@ -77,8 +80,9 @@ function print_receipts()
 
 	$cur = get_company_Pref('curr_default');
 
-	$rep = new FrontReport(_('RECEIPT'), "ReceiptBulk", user_pagesize());
-	$rep->SetHeaderType('Header2');
+	$rep = new FrontReport(_('RECEIPT'), "ReceiptBulk", user_pagesize(), 9, $orientation);
+   	if ($orientation == 'L')
+    	recalculate_cols($cols);
 	$rep->currency = $cur;
 	$rep->Font();
 	$rep->Info($params, $cols, null, $aligns);
@@ -94,13 +98,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'];
 
-			$rep->title = _('RECEIPT');
 			$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']);
 
@@ -133,17 +140,24 @@ function print_receipts()
 				$rep->TextColLines(1, 5, $memo, -2);
 			}
 
-			$rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
+			$rep->row = $rep->bottomMargin + (16 * $rep->lineHeight);
 
 			$rep->TextCol(3, 6, _("Total Allocated"), -2);
 			$rep->AmountCol(6, 7, $total_allocated, $dec, -2);
 			$rep->NewLine();
 			$rep->TextCol(3, 6, _("Left to Allocate"), -2);
-			$rep->AmountCol(6, 7, $myrow['Total'] - $total_allocated, $dec, -2);
+			$rep->AmountCol(6, 7, $myrow['Total'] + $myrow['ov_discount'] - $total_allocated, $dec, -2);
+			if (floatcmp($myrow['ov_discount'], 0))
+			{
+				$rep->NewLine();
+				$rep->TextCol(3, 6, _("Discount"), - 2);
+				$rep->AmountCol(6, 7, -$myrow['ov_discount'], $dec, -2);
+			}	
 			$rep->NewLine();
 			$rep->Font('bold');
 			$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 != "")
 			{
@@ -169,4 +183,3 @@ function print_receipts()
 	$rep->End();
 }
 
-?>
\ No newline at end of file