X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep113.php;h=522b62f82e74bfc5b10710b2e57b23b171cd83b2;hb=b0c4c9777f9574e9c2805fddc2a12576d75d94ce;hp=916032b82aedaae1f526bdb1f51343f1d5b221b9;hpb=74d962f7a82f2fd9543bf35faaa5026403b98cee;p=fa-stable.git

diff --git a/reporting/rep113.php b/reporting/rep113.php
index 916032b8..522b62f8 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");
 
@@ -42,15 +42,17 @@ function print_credits()
 	$email = $_POST['PARAM_3'];
 	$paylink = $_POST['PARAM_4'];
 	$comments = $_POST['PARAM_5'];
+	$orientation = $_POST['PARAM_6'];
 
 	if (!$from || !$to) return;
 
+	$orientation = ($orientation ? 'L' : 'P');
 	$dec = user_price_dec();
 
  	$fno = explode("-", $from);
 	$tno = explode("-", $to);
-	$from = min($fno[0], $fto[0]);
-	$to = max($fno[0], $fto[0]);
+	$from = min($fno[0], $tno[0]);
+	$to = max($fno[0], $tno[0]);
 
 	$cols = array(4, 60, 225, 300, 325, 385, 450, 515);
 
@@ -62,13 +64,9 @@ function print_credits()
 	$cur = get_company_Pref('curr_default');
 
 	if ($email == 0)
-	{
-		$rep = new FrontReport(_('CREDIT NOTE'), "InvoiceBulk", user_pagesize());
-		$rep->SetHeaderType('Header2');
-		$rep->currency = $cur;
-		$rep->Font();
-		$rep->Info($params, $cols, null, $aligns);
-	}
+		$rep = new FrontReport(_('CREDIT NOTE'), "InvoiceBulk", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+    	recalculate_cols($cols);
 
 	for ($i = $from; $i <= $to; $i++)
 	{
@@ -84,17 +82,16 @@ function print_credits()
 			$sales_order = null;
 			if ($email == 1)
 			{
-				$rep = new FrontReport("", "", user_pagesize());
-			    $rep->SetHeaderType('Header2');
-				$rep->currency = $cur;
-				$rep->Font();
+				$rep = new FrontReport("", "", user_pagesize(), 9, $orientation);
 				$rep->title = _('CREDIT NOTE');
 				$rep->filename = "CreditNote" . $myrow['reference'] . ".pdf";
-				$rep->Info($params, $cols, null, $aligns);
 			}
-			else
-				$rep->title = _('CREDIT NOTE');
-			$contacts = get_branch_contacts($branch['branch_code'], 'invoice', $branch['debtor_no']);
+		    $rep->SetHeaderType('Header2');
+			$rep->currency = $cur;
+			$rep->Font();
+			$rep->Info($params, $cols, null, $aligns);
+
+			$contacts = get_branch_contacts($branch['branch_code'], 'invoice', $branch['debtor_no'], true);
 			$rep->SetCommonData($myrow, $branch, $sales_order, $baccount, ST_CUSTCREDIT, $contacts);
 			$rep->NewPage();
 
@@ -131,12 +128,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);
@@ -159,14 +155,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 ($tax_item['included_in_price'])
+    			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)
     					{
@@ -211,4 +207,3 @@ function print_credits()
 		$rep->End();
 }
 
-?>
\ No newline at end of file