X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Freporting.inc;h=80632db211e2b2645413846bbad7ec37ef0d746d;hb=6bcd87642330092910f5d6977845a76ac59350ac;hp=9e2ce40340666935373e561fa6f43fe9ae1ef2e1;hpb=6a4d8e6c1e92ff1b8fc5abb3fae76fb1c1968550;p=fa-stable.git

diff --git a/reporting/includes/reporting.inc b/reporting/includes/reporting.inc
index 9e2ce403..80632db2 100644
--- a/reporting/includes/reporting.inc
+++ b/reporting/includes/reporting.inc
@@ -17,11 +17,12 @@
 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, $def_print_orientation;
+	global $path_to_root;
 	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);
+	$def_orientation = (user_def_print_orientation() == 1 ? 1 : 0);
+
 	switch ($type_no)
 	{
 		case ST_SALESQUOTE :
@@ -69,7 +70,9 @@ function print_document_link($doc_no, $link_text, $link=true, $type_no,
 				'PARAM_3' => $email, 
 				'PARAM_4' => '',
 				'PARAM_5' => '', 
-				'PARAM_6' => $def_orientation);
+				'PARAM_6' => $rep == 107 ? '' : $def_orientation);
+			if ($rep == 107)
+				$ar['PARAM_7'] = $def_orientation;
 			break;
 		case ST_PURCHORDER :
 			$rep = 209;
@@ -84,12 +87,12 @@ function print_document_link($doc_no, $link_text, $link=true, $type_no,
 			break;
 		case ST_CUSTPAYMENT :
 			$rep = 112;
-			// from, to, currency, email, comments, orientation
+			// from, to, currency, comments, orientation
 			$ar = array(
 				'PARAM_0' => $doc_no, 
 				'PARAM_1' => $doc_no, 
 				'PARAM_2' => '', 
-				'PARAM_3' => '', 
+				'PARAM_3' => '',
 				'PARAM_4' => $def_orientation);
 			break;
 		case ST_SUPPAYMENT :
@@ -113,9 +116,10 @@ function print_document_link($doc_no, $link_text, $link=true, $type_no,
 				'PARAM_3' => '', 
 				'PARAM_4' => $def_orientation);
 			break;
-//		default: $ar = array();
+		default:
+			return null;
 	}
-	
+
 	return print_link($link_text, $rep, $ar, "", $icon, $class, $id);
 }
 //
@@ -124,7 +128,7 @@ function print_document_link($doc_no, $link_text, $link=true, $type_no,
 function print_link($link_text, $rep, $pars = array(), $dir = '', 
 	$icon=false, $class='printlink', $id='')
 {
-	global $path_to_root, $pdf_debug;
+	global $path_to_root, $SysPrefs;
 
 	$url = $dir == '' ?  $path_to_root.'/reporting/prn_redirect.php?' : $dir;
 
@@ -136,7 +140,7 @@ function print_link($link_text, $rep, $pars = array(), $dir = '',
 	$url .= implode ('&', $pars);
 
 	if ($class != '')
-		$class = $pdf_debug ? '' : " class='$class'";
+		$class = $SysPrefs->pdf_debug ? '' : " class='$class'";
 	if ($id != '')
 		$id = " id='$id'";
 	$pars = access_string($link_text);
@@ -145,4 +149,42 @@ function print_link($link_text, $rep, $pars = array(), $dir = '',
 	return "<a target='_blank' href='$url'$id$class $pars[1]>$pars[0]</a>";
 }
 
-?>
\ No newline at end of file
+/*
+// Purpose: Function to parse a string into parameters
+// Release Date: 2014-12-26
+// Author: ApMuthu <apmuthu@usa.net>
+// Usage:
+$str = "PPFrt#2000 CID#6378465 TaxEx#2345-038 abcde ertrgdert COD#4253 jdegtd PIN#6473654";
+$p = parse_notes_params($str);
+echo print_r($p, true);
+
+An example of usage will be in the reporting/rep110.php file at near the end just before the last $rep-Font(); statement: 
+
+
+    $notes_params = parse_notes_params($branch['notes']);
+    if ($packing_slip == 0 && array_key_exists('CID', $notes_params)) {
+        $rep->NewLine(1);
+        $rep->TextCol(1, 7, "Old Customer# : " . $notes_params['CID'], - 2);
+    }
+*/
+
+function parse_notes_params($str, $sep=" ", $delim="#") {
+    $str_params = explode($sep, $str);
+    $param_array=Array('notes' => '');
+    foreach ($str_params AS $str_param) {
+        $param_set=explode($delim, trim($str_param));
+        $key = (array_key_exists(0, $param_set) ? trim($param_set[0]) : '');
+        $val = (array_key_exists(1, $param_set) ? trim($param_set[1]) : '');
+        if (strlen($key) > 0 && strlen($val) > 0) {
+            $param_array[$key]=$val;
+        } else {
+            // stop at first missing parameter set
+            // break;
+            // Collect the rest into notes
+            $param_array['notes'] .= (" " .  $str_param);
+        }
+    }
+    $param_array['notes'] = trim($param_array['notes']);
+    return $param_array;
+}
+