From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Tue, 15 Jan 2013 08:06:55 +0000 (+0100)
Subject: Print Links uses def_print_orientation value.
X-Git-Tag: v2.4.2~19^2~332
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=52ac949d4511c7cc985913d32de440c1b33fbcf6;p=fa-stable.git

Print Links uses def_print_orientation value.
---

diff --git a/manufacturing/work_order_entry.php b/manufacturing/work_order_entry.php
index af7bf947..3cdfe39f 100644
--- a/manufacturing/work_order_entry.php
+++ b/manufacturing/work_order_entry.php
@@ -53,16 +53,15 @@ if (isset($_GET['AddedID']))
 
 	display_notification_centered(_("The work order been added."));
 
-    display_note(get_trans_view_str($stype, $id, _("View this Work Order")));
+    display_note(get_trans_view_str($stype, $id, _("View this Work Order")), 0, 1);
 
 	if ($_GET['type'] != WO_ADVANCED)
 	{
 		include_once($path_to_root . "/reporting/includes/reporting.inc");
-    	$ar = array('PARAM_0' => $id, 'PARAM_1' => $id, 'PARAM_2' => 0); 
-    	display_note(print_link(_("Print this Work Order"), 409, $ar), 1);
-    	$ar['PARAM_2'] = 1;
-    	display_note(print_link(_("Email this Work Order"), 409, $ar), 1);
-    	display_note(get_gl_view_str($stype, $id, _("View the GL Journal Entries for this Work Order")), 1);
+ 		
+ 		submenu_print(_("&Print This Work Order"), ST_WORKORDER, $id, 'prtopt');
+		submenu_print(_("&Email This Work Order"), ST_WORKORDER, $id, null, 1);
+    	display_note(get_gl_view_str($stype, $id, _("View the GL Journal Entries for this Work Order")));
     	$ar = array('PARAM_0' => $_GET['date'], 'PARAM_1' => $_GET['date'], 'PARAM_2' => $stype); 
     	display_note(print_link(_("Print the GL Journal Entries for this Work Order"), 702, $ar), 1);
 		hyperlink_params("$path_to_root/admin/attachments.php", _("Add an Attachment"), "filterType=$stype&trans_no=$id");
diff --git a/reporting/includes/reporting.inc b/reporting/includes/reporting.inc
index 8dc119f6..7077f83a 100644
--- a/reporting/includes/reporting.inc
+++ b/reporting/includes/reporting.inc
@@ -17,11 +17,11 @@
 function print_document_link($doc_no, $link_text, $link=true, $type_no, 
 	$icon=false, $class='printlink', $id='', $email=0, $extra=0)
 {
-	global $path_to_root;
+	global $path_to_root, $def_print_orientation;
 	include_once($path_to_root . "/includes/types.inc");
 
 	$url = $path_to_root.'/reporting/prn_redirect.php?';
-
+	$def_orientation = (isset($def_print_orientation) && $def_print_orientation == 1 ? 1 : 0);
 	switch ($type_no)
 	{
 		case ST_SALESQUOTE :
@@ -32,7 +32,8 @@ function print_document_link($doc_no, $link_text, $link=true, $type_no,
 				'PARAM_1' => $doc_no, 
 				'PARAM_2' => '', 
 				'PARAM_3' => $email, 
-				'PARAM_4' => '');
+				'PARAM_4' => '',
+				'PARAM_5' => $def_orientation);
 			break;
 		case ST_SALESORDER :
 			$rep = 109;
@@ -43,7 +44,8 @@ function print_document_link($doc_no, $link_text, $link=true, $type_no,
 				'PARAM_2' => '', 
 				'PARAM_3' => $email, 
 				'PARAM_4' => 0, 
-				'PARAM_5' => '');
+				'PARAM_5' => '',
+				'PARAM_6' => $def_orientation);
 			break;
 		case ST_CUSTDELIVERY :
 			$rep = 110;
@@ -52,7 +54,9 @@ function print_document_link($doc_no, $link_text, $link=true, $type_no,
 				'PARAM_0' => $doc_no, 
 				'PARAM_1' => $doc_no, 
 				'PARAM_2' => $email,
-				'PARAM_3' => $extra);
+				'PARAM_3' => $extra,
+				'PARAM_4' => '',
+				'PARAM_5' => $def_orientation);
 			break;
 		case ST_SALESINVOICE : // Sales Invoice
 		case ST_CUSTCREDIT : // Customer Credit Note
@@ -65,7 +69,7 @@ function print_document_link($doc_no, $link_text, $link=true, $type_no,
 				'PARAM_3' => $email, 
 				'PARAM_4' => '',
 				'PARAM_5' => '', 
-				'PARAM_6' => $type_no);
+				'PARAM_6' => $def_orientation);
 			break;
 		case ST_PURCHORDER :
 			$rep = 209;
@@ -75,7 +79,8 @@ function print_document_link($doc_no, $link_text, $link=true, $type_no,
 				'PARAM_1' => $doc_no, 
 				'PARAM_2' => '', 
 				'PARAM_3' => $email, 
-				'PARAM_4' => '');
+				'PARAM_4' => '',
+				'PARAM_5' => $def_orientation);
 			break;
 		case ST_CUSTPAYMENT :
 			$rep = 112;
@@ -84,7 +89,8 @@ function print_document_link($doc_no, $link_text, $link=true, $type_no,
 				'PARAM_0' => $doc_no, 
 				'PARAM_1' => $doc_no, 
 				'PARAM_2' => '', 
-				'PARAM_4' => '');
+				'PARAM_3' => '', 
+				'PARAM_4' => $def_orientation);
 			break;
 		case ST_SUPPAYMENT :
 			$rep = 210;
@@ -94,17 +100,18 @@ function print_document_link($doc_no, $link_text, $link=true, $type_no,
 				'PARAM_1' => $doc_no, 
 				'PARAM_2' => '', 
 				'PARAM_3' => $email, 
-				'PARAM_4' => '');
+				'PARAM_4' => '',
+				'PARAM_5' => $def_orientation);
 			break;
 		case ST_WORKORDER :
 			$rep = 409;
-			// from, to, currency, bank acc, email, comments
+			// from, to, currency, bank acc, email, comments, orientation
 			$ar = array(
 				'PARAM_0' => $doc_no, 
 				'PARAM_1' => $doc_no, 
 				'PARAM_2' => $email, 
 				'PARAM_3' => '', 
-				'PARAM_4' => '');
+				'PARAM_4' => $def_orientation);
 			break;
 //		default: $ar = array();
 	}