X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep113.php;h=aec634e25f3da7d65e1b562d3766d7451011240a;hb=05d1e1fc65fe68645b540e06884db0e9f24b1a21;hp=3c140ea05f3bcaac752263e29eb6d6236383c3ce;hpb=7ff72280e015c920df41faad255d19173bf4f141;p=fa-stable.git

diff --git a/reporting/rep113.php b/reporting/rep113.php
index 3c140ea0..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,32 +131,31 @@ 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);
    			$DisplayFreight = number_format2($sign*$myrow["ov_freight"],$dec);
 
     		$rep->row = $rep->bottomMargin + (15 * $rep->lineHeight);
-			$linetype = true;
 			$doctype = ST_CUSTCREDIT;
-			include($path_to_root . "/reporting/includes/doctext.inc");
 
-			$rep->TextCol(3, 6, $doc_Sub_total, -2);
+			$rep->TextCol(3, 6, _("Sub-total"), -2);
 			$rep->TextCol(6, 7,	$DisplaySubTot, -2);
 			$rep->NewLine();
-			$rep->TextCol(3, 6, $doc_Shipping, -2);
+			$rep->TextCol(3, 6, _("Shipping"), -2);
 			$rep->TextCol(6, 7,	$DisplayFreight, -2);
 			$rep->NewLine();
 			$tax_items = get_trans_tax_details(ST_CUSTCREDIT, $i);
 			$first = true;
     		while ($tax_item = db_fetch($tax_items))
     		{
+    			if ($tax_item['amount'] == 0)
+    				continue;
     			$DisplayTax = number_format2($sign*$tax_item['amount'], $dec);
     			
     			if (isset($suppress_tax_rates) && $suppress_tax_rates == 1)
@@ -179,7 +178,7 @@ function print_credits()
 						$first = false;
     				}
     				else
-						$rep->TextCol(3, 7, $doc_Included . " " . $tax_type_name . $doc_Amount . ": " . $DisplayTax, -2);
+						$rep->TextCol(3, 7, _("Included") . " " . $tax_type_name . _("Amount") . ": " . $DisplayTax, -2);
 				}
     			else
     			{
@@ -192,7 +191,7 @@ function print_credits()
 			$DisplayTotal = number_format2($sign*($myrow["ov_freight"] + $myrow["ov_gst"] +
 				$myrow["ov_amount"]+$myrow["ov_freight_tax"]),$dec);
 			$rep->Font('bold');
-			$rep->TextCol(3, 6, $doc_TOTAL_INVOICE, - 2);
+			$rep->TextCol(3, 6, _("TOTAL CREDIT"), - 2);
 			$rep->TextCol(6, 7, $DisplayTotal, -2);
 			$words = price_in_words($myrow['Total'], ST_CUSTCREDIT);
 			if ($words != "")
@@ -204,7 +203,7 @@ function print_credits()
 			if ($email == 1)
 			{
 				$myrow['dimension_id'] = $paylink; // helper for pmt link
-				$rep->End($email, $doc_Invoice_no . " " . $myrow['reference'], $myrow, ST_CUSTCREDIT);
+				$rep->End($email);
 			}
 	}
 	if ($email == 0)