X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep210.php;h=9f14a1ae2975ad8fd72ae6dcbb96aab7c0b17749;hb=3974cfebf97c03e07b0beb608ae63b84b1e0f908;hp=5b7634d2a1ece014c3aedbb04f8ee5081bb54353;hpb=3c73d05998cf50fed7fa5c0a568a1a911e7023e2;p=fa-stable.git

diff --git a/reporting/rep210.php b/reporting/rep210.php
index 5b7634d2..9f14a1ae 100644
--- a/reporting/rep210.php
+++ b/reporting/rep210.php
@@ -48,18 +48,6 @@ function get_remittance($type, $trans_no)
     return db_fetch($result);
 }
 
-function get_allocations_for_remittance($supplier_id, $type, $trans_no)
-{
-	$sql = get_alloc_supp_sql("amt, supp_reference, trans.alloc", "trans.trans_no = alloc.trans_no_to
-		AND trans.type = alloc.trans_type_to
-		AND alloc.trans_no_from=".db_escape($trans_no)."
-		AND alloc.trans_type_from=".db_escape($type)."
-		AND trans.supplier_id=".db_escape($supplier_id),
-		TB_PREF."supp_allocations as alloc");
-	$sql .= " ORDER BY trans_no";
-	return db_query($sql, "Cannot retreive alloc to transactions");
-}
-
 function print_remittances()
 {
 	global $path_to_root, $systypes_array;
@@ -107,7 +95,7 @@ function print_remittances()
 		{
 			$myrow = get_remittance($j, $i);
 			if (!$myrow)
-				continue;			
+				continue;
 			if ($currency != ALL_TEXT && $myrow['curr_code'] != $currency) {
 				continue;
 			}
@@ -121,22 +109,22 @@ function print_remittances()
 				$rep->title = _('REMITTANCE');
 				$rep->filename = "Remittance" . $i . ".pdf";
 			}
-			$rep->SetHeaderType('Header2');
 			$rep->currency = $cur;
 			$rep->Font();
 			$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_allocations_for_remittance($myrow['supplier_id'], $myrow['type'], $myrow['trans_no']);
+			$result = get_allocatable_to_supp_transactions($myrow['supplier_id'], $myrow['trans_no'], $myrow['type']);
 
 			$doctype = ST_SUPPAYMENT;
 
 			$total_allocated = 0;
 			$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);
@@ -185,17 +173,16 @@ function print_remittances()
 			{
 				$rep->NewLine(2);
 				$rep->TextCol(1, 7, $myrow['curr_code'] . ": " . $words, - 2);
-			}	
+			}
 			$rep->Font();
 			if ($email == 1)
 			{
 				$myrow['DebtorName'] = $myrow['supp_name'];
 				$rep->End($email);
 			}
-		}	
+		}
 	}
 	if ($email == 0)
 		$rep->End();
 }
 
-?>
\ No newline at end of file