X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=admin%2Fview_print_transaction.php;h=0b4de2d25fde1dc98498a595e96ee33c0148a026;hb=df660a601cabb0afe7f3246884f16207b9a0c314;hp=5a6d5738b8a29578da2f5e8db4d1b4478e1c9e51;hpb=d9b4de9d7e9d3ba77f6ece752fd6cc988effd8f1;p=fa-stable.git

diff --git a/admin/view_print_transaction.php b/admin/view_print_transaction.php
index 5a6d5738..0b4de2d2 100644
--- a/admin/view_print_transaction.php
+++ b/admin/view_print_transaction.php
@@ -22,27 +22,46 @@ include_once($path_to_root . "/admin/db/transactions_db.inc");
 
 include_once($path_to_root . "/reporting/includes/reporting.inc");
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
 	$js .= get_js_open_window(800, 500);
 page(_($help_context = "View or Print Transactions"), false, false, "", $js);
 
 //----------------------------------------------------------------------------------------
 function view_link($trans)
 {
+	if (!isset($trans['type']))
+		$trans['type'] = $_POST['filterType'];
 	return get_trans_view_str($trans["type"], $trans["trans_no"]);
 }
 
 function prt_link($row)
 {
-  	if ($row['type'] != ST_CUSTPAYMENT && $row['type'] != ST_BANKDEPOSIT) // customer payment or bank deposit printout not defined yet.
+	if (!isset($row['type']))
+		$row['type'] = $_POST['filterType'];
+  	if ($row['type'] == ST_PURCHORDER || $row['type'] == ST_SALESORDER || $row['type'] == ST_SALESQUOTE || 
+  		$row['type'] == ST_WORKORDER)
  		return print_document_link($row['trans_no'], _("Print"), true, $row['type'], ICON_PRINT);
+ 	else	
+		return print_document_link($row['trans_no']."-".$row['type'], _("Print"), true, $row['type'], ICON_PRINT);
 }
 
 function gl_view($row)
 {
+	if (!isset($row['type']))
+		$row['type'] = $_POST['filterType'];
 	return get_gl_view_str($row["type"], $row["trans_no"]);
 }
 
+function date_view($row)
+{
+	return $row['trans_date'];
+}
+
+function ref_view($row)
+{
+	return $row['ref'];
+}
+
 function viewing_controls()
 {
 	display_note(_("Only documents can be printed."));
@@ -94,18 +113,19 @@ function handle_search()
 	if (check_valid_entries()==true)
 	{
 		$trans_ref = false;
-		$sql = get_sql_for_view_transactions($_POST['filterType'], $_POST['FromTransNo'], $_POST['ToTransNo'], $trans_ref);
+		$sql = get_sql_for_view_transactions(get_post('filterType'), get_post('FromTransNo'), get_post('ToTransNo'), $trans_ref);
 		if ($sql == "")
 			return;
 
-		$print_type = $_POST['filterType'];
+		$print_type = get_post('filterType');
 		$print_out = ($print_type == ST_SALESINVOICE || $print_type == ST_CUSTCREDIT || $print_type == ST_CUSTDELIVERY ||
-			$print_type == ST_PURCHORDER || $print_type == ST_SALESORDER || $print_type == ST_SALESQUOTE);
+			$print_type == ST_PURCHORDER || $print_type == ST_SALESORDER || $print_type == ST_SALESQUOTE ||
+			$print_type == ST_CUSTPAYMENT || $print_type == ST_SUPPAYMENT || $print_type == ST_WORKORDER);
 
 		$cols = array(
-			_("#"), 
-			_("Reference"), 
-			_("View") => array('insert'=>true, 'fun'=>'view_link'),
+			_("#") => array('insert'=>true, 'fun'=>'view_link'), 
+			_("Reference") => array('fun'=>'ref_view'), 
+			_("Date") => array('type'=>'date', 'fun'=>'date_view'),
 			_("Print") => array('insert'=>true, 'fun'=>'prt_link'), 
 			_("GL") => array('insert'=>true, 'fun'=>'gl_view')
 		);
@@ -141,4 +161,3 @@ end_form(2);
 
 end_page();
 
-?>