X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=reporting%2Fincludes%2Freports_classes.inc;h=2b1c6d5557965eff7dd4f7b507545084de3fd678;hb=11e485e4a7c5f12c9424713b7330815a9cc5e4ae;hp=9a04b58ef56a8c17c910cd76a9d3ebc67972a6a7;hpb=b42adf7edd906956a0f9cf21c0ec2b66007b9585;p=fa-stable.git

diff --git a/reporting/includes/reports_classes.inc b/reporting/includes/reports_classes.inc
index 9a04b58e..2b1c6d55 100644
--- a/reporting/includes/reports_classes.inc
+++ b/reporting/includes/reports_classes.inc
@@ -197,7 +197,8 @@ class Report
 					$st .= dup_simple_name_list("PARAM_$index", $sel);
 					break;
 				case 'SYS_TYPES':
-					$st .= dup_systypes_list("PARAM_$index", $dummy, true, _("No Type Filter"), true);
+				case 'SYS_TYPES_ALL':
+					$st .= dup_systypes_list("PARAM_$index", $dummy, true, _("No Type Filter"), ($param->param_type=='SYS_TYPES_ALL'));
 					break;
 				case 'TEXT':
 					$st .= "<input type='text' name='PARAM_$index'>";
@@ -283,7 +284,15 @@ class Report
 				case 'ORDERS':
 					$sql = "SELECT ".TB_PREF."sales_orders.order_no, concat(".TB_PREF."sales_orders.order_no, '-',
 						".TB_PREF."debtors_master.name) as IName
-						FROM ".TB_PREF."debtors_master, ".TB_PREF."sales_orders WHERE ".TB_PREF."debtors_master.debtor_no=".TB_PREF."sales_orders.debtor_no ORDER BY ".TB_PREF."sales_orders.order_no DESC";
+						FROM ".TB_PREF."debtors_master, ".TB_PREF."sales_orders WHERE ".TB_PREF."debtors_master.debtor_no=".TB_PREF."sales_orders.debtor_no 
+						AND ".TB_PREF."sales_orders.trans_type=30 ORDER BY ".TB_PREF."sales_orders.order_no DESC";
+					$st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy);
+					break;
+				case 'QUOTATIONS':
+					$sql = "SELECT ".TB_PREF."sales_orders.order_no, concat(".TB_PREF."sales_orders.order_no, '-',
+						".TB_PREF."debtors_master.name) as IName
+						FROM ".TB_PREF."debtors_master, ".TB_PREF."sales_orders WHERE ".TB_PREF."debtors_master.debtor_no=".TB_PREF."sales_orders.debtor_no 
+						AND ".TB_PREF."sales_orders.trans_type=32 ORDER BY ".TB_PREF."sales_orders.order_no DESC";
 					$st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy);
 					break;
 				case 'PO':
@@ -421,7 +430,7 @@ function dup_simple_name_list($name, $selections)
 
 //------------------------------------------------------------------------------------------------
 
-function dup_systypes_list($name, &$selected_id, $all_option=false, $all_option_name=null)
+function dup_systypes_list($name, &$selected_id, $all_option=false, $all_option_name=null, $all_types=false)
 {
 	global $systypes_array;
 
@@ -439,7 +448,7 @@ function dup_systypes_list($name, &$selected_id, $all_option=false, $all_option_
 
 	foreach ($systypes_array as $i => $value)
 	{
-		if ($i == 16 || $i == 18 || $i == 25 || ($i >= 28 && $i <= 30) || $i >= 40)
+		if (!$all_types && ($i == 16 || $i == 18 || $i == 25 || ($i >= 28 && $i <= 30) || $i >= 40))
 			continue;
     	$st .= "<option" . ($selected_id == $i ? " selected" : "") . " value='$i'>" . $value['name'] . "</option>\n";
 	}