X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Freporting.inc;h=4f2e6665bf11bb1b818415de58a9357dff445b27;hb=53d942f2a0d20cce5e9c409c6485867ce0869e4d;hp=9df4942975e2d1850605f5193d7aa05a5136b546;hpb=80dd97a37f674cc3691fa04af4c29607067566b2;p=fa-stable.git

diff --git a/reporting/includes/reporting.inc b/reporting/includes/reporting.inc
index 9df49429..4f2e6665 100644
--- a/reporting/includes/reporting.inc
+++ b/reporting/includes/reporting.inc
@@ -15,71 +15,104 @@
 // You only need full parameter list for invoices/credit notes
 
 function print_document_link($doc_no, $link_text, $link=true, $type_no, 
-	$icon=false, $class='printlink', $id='', $email=0)
+	$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 :
 			$rep = 111;
-			// from, to, currency, bank acc, email, quote, comments
+			// from, to, currency, email, comments, orientation
 			$ar = array(
 				'PARAM_0' => $doc_no, 
 				'PARAM_1' => $doc_no, 
-				'PARAM_2' => "", 
-				'PARAM_3' => get_first_bank_account(), 
-				'PARAM_4' => $email, 
-				'PARAM_5' => "");
+				'PARAM_2' => '', 
+				'PARAM_3' => $email, 
+				'PARAM_4' => '',
+				'PARAM_5' => $def_orientation);
 			break;
 		case ST_SALESORDER :
 			$rep = 109;
-			// from, to, currency, bank acc, email, quote, comments
+			// from, to, currency, email, quote, comments, orientation
 			$ar = array(
 				'PARAM_0' => $doc_no, 
 				'PARAM_1' => $doc_no, 
-				'PARAM_2' => "", 
-				'PARAM_3' => get_first_bank_account(), 
-				'PARAM_4' => $email, 
-				'PARAM_5' => 0, 
-				'PARAM_6' => "");
+				'PARAM_2' => '', 
+				'PARAM_3' => $email, 
+				'PARAM_4' => 0, 
+				'PARAM_5' => '',
+				'PARAM_6' => $def_orientation);
 			break;
 		case ST_CUSTDELIVERY :
 			$rep = 110;
-			// from, to, email, comments
+			// from, to, email, packing slip, comments, orientation
 			$ar = array(
 				'PARAM_0' => $doc_no, 
 				'PARAM_1' => $doc_no, 
-				'PARAM_2' => $email, 
-				'PARAM_3' => "");
+				'PARAM_2' => $email,
+				'PARAM_3' => $extra,
+				'PARAM_4' => '',
+				'PARAM_5' => $def_orientation);
 			break;
-		case 10 : // Sales Invoice
-		case 11 : // Customer Credit Note
-			$rep = 107;
-			// from, to, currency, bank acc, email, paylink, comments, type
+		case ST_SALESINVOICE : // Sales Invoice
+		case ST_CUSTCREDIT : // Customer Credit Note
+			$rep = $type_no==ST_CUSTCREDIT ? 113 : 107;
+			// from, to, currency, email, paylink, comments, orientation
 			$ar = array(
 				'PARAM_0' => $doc_no, 
 				'PARAM_1' => $doc_no, 
-				'PARAM_2' => "", 
-				'PARAM_3' => get_first_bank_account(), 
-				'PARAM_4' => $email, 
-				'PARAM_5' => "",
-				'PARAM_6' => "", 
-				'PARAM_7' => $type_no);
+				'PARAM_2' => '', 
+				'PARAM_3' => $email, 
+				'PARAM_4' => '',
+				'PARAM_5' => '', 
+				'PARAM_6' => $def_orientation);
 			break;
 		case ST_PURCHORDER :
 			$rep = 209;
-			// from, to, currency, bank acc, email, comments
+			// from, to, currency, email, comments, orientation
+			$ar = array(
+				'PARAM_0' => $doc_no, 
+				'PARAM_1' => $doc_no, 
+				'PARAM_2' => '', 
+				'PARAM_3' => $email, 
+				'PARAM_4' => '',
+				'PARAM_5' => $def_orientation);
+			break;
+		case ST_CUSTPAYMENT :
+			$rep = 112;
+			// from, to, currency, comments, orientation
+			$ar = array(
+				'PARAM_0' => $doc_no, 
+				'PARAM_1' => $doc_no, 
+				'PARAM_2' => '', 
+				'PARAM_3' => '',
+				'PARAM_4' => $def_orientation);
+			break;
+		case ST_SUPPAYMENT :
+			$rep = 210;
+			// from, to, currency, email, comments, orientation
+			$ar = array(
+				'PARAM_0' => $doc_no, 
+				'PARAM_1' => $doc_no, 
+				'PARAM_2' => '', 
+				'PARAM_3' => $email, 
+				'PARAM_4' => '',
+				'PARAM_5' => $def_orientation);
+			break;
+		case ST_WORKORDER :
+			$rep = 409;
+			// from, to, email, comments, orientation
 			$ar = array(
 				'PARAM_0' => $doc_no, 
 				'PARAM_1' => $doc_no, 
-				'PARAM_2' => "", 
-				'PARAM_3' => get_first_bank_account(), 
-				'PARAM_4' => $email, 
-				'PARAM_5' => "");
+				'PARAM_2' => $email, 
+				'PARAM_3' => '', 
+				'PARAM_4' => $def_orientation);
 			break;
 //		default: $ar = array();
 	}
@@ -113,12 +146,4 @@ function print_link($link_text, $rep, $pars = array(), $dir = '',
 	return "<a target='_blank' href='$url'$id$class $pars[1]>$pars[0]</a>";
 }
 
-function get_first_bank_account()
-{
-	$sql = "SELECT ".TB_PREF."bank_accounts.id FROM ".TB_PREF."bank_accounts, ".TB_PREF."company
-		WHERE bank_curr_code=curr_default LIMIT 0, 1";
-	$result = db_query($sql);
-	$row = db_fetch_row($result);
-	return $row[0];
-}
 ?>
\ No newline at end of file