X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep113.php;h=aec634e25f3da7d65e1b562d3766d7451011240a;hb=a01cbf378c448da44758b9b9898eb1acc970e84a;hp=4a110745cd02180823c77ce2fc423c1c526d1d69;hpb=565a41e2d7fd4b4a32848e4829c11dbbcb5881d1;p=fa-stable.git

diff --git a/reporting/rep113.php b/reporting/rep113.php
index 4a110745..aec634e2 100644
--- a/reporting/rep113.php
+++ b/reporting/rep113.php
@@ -43,14 +43,14 @@ function print_credits()
 	$paylink = $_POST['PARAM_4'];
 	$comments = $_POST['PARAM_5'];
 
-	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, 60, 225, 300, 325, 385, 450, 515);
 
@@ -70,7 +70,7 @@ function print_credits()
 		$rep->Info($params, $cols, null, $aligns);
 	}
 
-	for ($i = $fno[0]; $i <= $tno[0]; $i++)
+	for ($i = $from; $i <= $to; $i++)
 	{
 			if (!exists_customer_trans(ST_CUSTCREDIT, $i))
 				continue;
@@ -94,7 +94,7 @@ function print_credits()
 			}
 			else
 				$rep->title = _('CREDIT NOTE');
-			$contacts = get_branch_contacts($branch['branch_code'], 'invoice', $branch['debtor_no']);
+			$contacts = get_branch_contacts($branch['branch_code'], 'invoice', $branch['debtor_no'], false);
 			$rep->SetCommonData($myrow, $branch, $sales_order, $baccount, ST_CUSTCREDIT, $contacts);
 			$rep->NewPage();
 
@@ -131,12 +131,11 @@ function print_credits()
 					$rep->NewPage();
 			}
 
-			$comments = get_comments(ST_CUSTCREDIT, $i);
-			if ($comments && db_num_rows($comments))
+			$memo = get_comments_string(ST_CUSTCREDIT, $i);
+			if ($memo != "")
 			{
 				$rep->NewLine();
-    			while ($comment=db_fetch($comments))
-    				$rep->TextColLines(0, 6, $comment['memo_'], -2);
+				$rep->TextColLines(1, 5, $memo, -2);
 			}
 
    			$DisplaySubTot = number_format2($SubTotal,$dec);
@@ -204,7 +203,7 @@ function print_credits()
 			if ($email == 1)
 			{
 				$myrow['dimension_id'] = $paylink; // helper for pmt link
-				$rep->End($email, '', $myrow, ST_CUSTCREDIT);
+				$rep->End($email);
 			}
 	}
 	if ($email == 0)