X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep210.php;h=98b4a9b024c232eab641a40e3b7d9fdfbd3188ad;hb=a31195793c023906ab5da62f06ab84aefed445c3;hp=4b9489c53685c00bb38c958ca8c0a1fc9aa14cbd;hpb=0489317205141deaecefe3a7243d11a3e38a51d0;p=fa-stable.git

diff --git a/reporting/rep210.php b/reporting/rep210.php
index 4b9489c5..98b4a9b0 100644
--- a/reporting/rep210.php
+++ b/reporting/rep210.php
@@ -32,15 +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+".TB_PREF."supp_trans.ov_discount) AS Total, 
-   		".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;
@@ -60,9 +63,9 @@ function print_remittances()
 	$comments = $_POST['PARAM_4'];
 	$orientation = $_POST['PARAM_5'];
 
-	$orientation = ($orientation ? 'L' : 'P');
 	if (!$from || !$to) return;
 
+	$orientation = ($orientation ? 'L' : 'P');
 	$dec = user_price_dec();
 
  	$fno = explode("-", $from);
@@ -82,7 +85,7 @@ function print_remittances()
 	if ($email == 0)
 		$rep = new FrontReport(_('REMITTANCE'), "RemittanceBulk", user_pagesize(), 9, $orientation);
     if ($orientation == 'L')
-    	$rep->recalculate_cols($cols);
+    	recalculate_cols($cols);
 
 	for ($i = $from; $i <= $to; $i++)
 	{
@@ -95,21 +98,26 @@ 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'];
 
 			if ($email == 1)
+			{
 				$rep = new FrontReport("", "", user_pagesize(), 9, $orientation);
-			$rep->SetHeaderType('Header2');
+				$rep->title = _('REMITTANCE');
+				$rep->filename = "Remittance" . $i . ".pdf";
+			}
 			$rep->currency = $cur;
 			$rep->Font();
-			$rep->title = _('REMITTANCE');
-			$rep->filename = "Remittance" . $i . ".pdf";
 			$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']);
 
@@ -141,18 +149,27 @@ function print_remittances()
 				$rep->NewLine();
 				$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);
 			$myrow['Total'] *= -1;
-			$rep->AmountCol(6, 7, $myrow['Total'] - $total_allocated, $dec, -2);
+			$myrow['ov_discount'] *= -1;
+			$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 REMITTANCE"), - 2);
 			$rep->AmountCol(6, 7, $myrow['Total'], $dec, -2);
+
 			$words = price_in_words($myrow['Total'], ST_SUPPAYMENT);
 			if ($words != "")
 			{
@@ -171,4 +188,3 @@ function print_remittances()
 		$rep->End();
 }
 
-?>
\ No newline at end of file