X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep113.php;h=acf855c426618f39bd1e18ff7df4caf6bfc386be;hb=9451db1760036985de791ba24c442801e37f37de;hp=8dfb92b139559621b8c88a309319ee8b213ad381;hpb=0489317205141deaecefe3a7243d11a3e38a51d0;p=fa-stable.git

diff --git a/reporting/rep113.php b/reporting/rep113.php
index 8dfb92b1..acf855c4 100644
--- a/reporting/rep113.php
+++ b/reporting/rep113.php
@@ -32,7 +32,7 @@ print_credits();
 
 function print_credits()
 {
-	global $path_to_root, $alternative_tax_include_on_docs, $suppress_tax_rates;
+	global $path_to_root, $SysPrefs;
 	
 	include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
@@ -44,9 +44,9 @@ function print_credits()
 	$comments = $_POST['PARAM_5'];
 	$orientation = $_POST['PARAM_6'];
 
-	$orientation = ($orientation ? 'L' : 'P');
 	if (!$from || !$to) return;
 
+	$orientation = ($orientation ? 'L' : 'P');
 	$dec = user_price_dec();
 
  	$fno = explode("-", $from);
@@ -66,7 +66,7 @@ function print_credits()
 	if ($email == 0)
 		$rep = new FrontReport(_('CREDIT NOTE'), "InvoiceBulk", user_pagesize(), 9, $orientation);
     if ($orientation == 'L')
-    	$rep->recalculate_cols($cols);
+    	recalculate_cols($cols);
 
 	for ($i = $from; $i <= $to; $i++)
 	{
@@ -74,6 +74,9 @@ function print_credits()
 				continue;
 			$sign = -1;
 			$myrow = get_customer_trans($i, ST_CUSTCREDIT);
+			if ($currency != ALL_TEXT && $myrow['curr_code'] != $currency) {
+				continue;
+			}
 			$baccount = get_default_bank_account($myrow['curr_code']);
 			$params['bankaccount'] = $baccount['id'];
 
@@ -81,16 +84,18 @@ function print_credits()
 			$branch['disable_branch'] = $paylink; // helper
 			$sales_order = null;
 			if ($email == 1)
+			{
 				$rep = new FrontReport("", "", user_pagesize(), 9, $orientation);
-			$rep->SetHeaderType('Header2');
+				$rep->title = _('CREDIT NOTE');
+				$rep->filename = "CreditNote" . $myrow['reference'] . ".pdf";
+			}
 			$rep->currency = $cur;
 			$rep->Font();
-			$rep->title = _('CREDIT NOTE');
-			$rep->filename = "CreditNote" . $myrow['reference'] . ".pdf";
 			$rep->Info($params, $cols, null, $aligns);
 
-			$contacts = get_branch_contacts($branch['branch_code'], 'invoice', $branch['debtor_no'], false);
+			$contacts = get_branch_contacts($branch['branch_code'], 'invoice', $branch['debtor_no'], true);
 			$rep->SetCommonData($myrow, $branch, $sales_order, $baccount, ST_CUSTCREDIT, $contacts);
+		    $rep->SetHeaderType('Header2');
 			$rep->NewPage();
 
    			$result = get_customer_trans_details(ST_CUSTCREDIT, $i);
@@ -153,14 +158,14 @@ function print_credits()
     				continue;
     			$DisplayTax = number_format2($sign*$tax_item['amount'], $dec);
     			
-    			if (isset($suppress_tax_rates) && $suppress_tax_rates == 1)
+    			if ($SysPrefs->suppress_tax_rates() == 1)
     				$tax_type_name = $tax_item['tax_type_name'];
     			else
     				$tax_type_name = $tax_item['tax_type_name']." (".$tax_item['rate']."%) ";
 
     			if ($myrow['tax_included'])
     			{
-    				if (isset($alternative_tax_include_on_docs) && $alternative_tax_include_on_docs == 1)
+    				if ($SysPrefs->alternative_tax_include_on_docs() == 1)
     				{
     					if ($first)
     					{
@@ -205,4 +210,3 @@ function print_credits()
 		$rep->End();
 }
 
-?>
\ No newline at end of file