X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Freports_classes.inc;h=69597924d89a7dda3eb1c062ae2a1d2e281c8088;hb=39ef29ec4c57a03feabd4ecfa599e71f35b3dddb;hp=c717c973937536866c7170f5d934478aa99f999d;hpb=0e716939fce4726f0ac912b120e977d885fbba68;p=fa-stable.git

diff --git a/reporting/includes/reports_classes.inc b/reporting/includes/reports_classes.inc
index c717c973..69597924 100644
--- a/reporting/includes/reports_classes.inc
+++ b/reporting/includes/reports_classes.inc
@@ -1,4 +1,14 @@
 <?php
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 class BoxReports
 {
 	var $ar_classes;
@@ -34,15 +44,17 @@ class BoxReports
 			$style = $class_counter==$_REQUEST['Class'] ? '' : "style='display:none'";
 			$acc = access_string($key);
 			$st_classes .= "<a href='"
-				.$_SERVER['PHP_SELF']."?Class=$class_counter"
-				."' onclick='return showClass($class_counter);'$acc[1]>$acc[0]</a> <br>";
+				.$_SERVER['PHP_SELF']."?Class=$class_counter'"
+				." class='menu_option' id='".default_focus()."'"
+				." onclick='return showClass($class_counter);'$acc[1]>$acc[0]</a> <br>";
 			$st_reports .= "<table id='TAB_" . $class_counter ."' $style cellpadding=0 cellspacing=0 border=0 width='100%'><tr><td><b>" . _("Reports For Class: ") . "&nbsp;$key</b></td></tr>\n";
 			foreach($value as $report)
 			{
 				$acc = access_string($report->name);
 				$st_reports .= "<tr><td><a class='printlink' href='"
-					.$_SERVER['PHP_SELF']."?Class=$class_counter&rep_id=$report->id"
-					."'$acc[1]>$acc[0]</a><tr><td>\n";
+					.$_SERVER['PHP_SELF']."?Class=$class_counter&rep_id=$report->id'"
+					." id='".default_focus()."'"
+					."$acc[1]>$acc[0]</a><tr><td>\n";
 				if (isset($_REQUEST['rep_id']) && $_REQUEST['rep_id']==$report->id) {
 
 					$action = $path_to_root.'/reporting/prn_redirect.php';
@@ -51,10 +63,11 @@ class BoxReports
 						. "<form method='POST' action='$action' target='_blank'>\n";
 					$st_params .= hidden('REP_ID', $report->id, false);
 					$st_params .= submit('Rep'.$report->id,  
-						_("Display: ") . access_string($report->name,true),
-						false, '', $pdf_debug==0) . '<br><br>';
+						_("Display: ") . access_string($report->name, true),
+						false, '', $pdf_debug ? false : 'default') . '<br><br>';
 					$st_params .= $report->getDisplay() 
 						. "\n</form></td></tr></table>\n";
+					set_focus('Rep'.$report->id);
 					$Ajax->addUpdate(true, 'rep_form', $st_params);
 				}
 			}
@@ -109,7 +122,7 @@ class Report
 	
 	function getDisplay()
 	{
-		global $path_to_root, $use_date_picker, $pdf_debug;
+		global $path_to_root, $use_date_picker, $pdf_debug, $print_invoice_no;
 
 		$st = '';
 		$dummy = "";
@@ -150,8 +163,9 @@ class Report
 							$date = $edate;
 						else
 						{
-							$bdate = add_months($edate, -$row['tax_prd'] + 1);
-							$date = begin_month($bdate);
+							$bdate = begin_month($edate);
+							$bdate = add_months($bdate, -$row['tax_prd'] + 1);
+							$date = $bdate;
 						}
 					}
 					$name = "PARAM_$index";
@@ -170,6 +184,10 @@ class Report
 					$sel = array(_("No Payment Link"), "PayPal");
 					$st .= dup_simple_name_list("PARAM_$index", $sel);
 					break;
+				case 'DESTINATION':
+					$sel = array(_("PDF/Printer"), "Excel");
+					$st .= dup_simple_name_list("PARAM_$index", $sel);
+					break;
 				case 'COMPARE':
 					$sel = array(_("Accumulated"), _("Period Y-1"), _("Budget"));
 					$st .= dup_simple_name_list("PARAM_$index", $sel);
@@ -200,27 +218,27 @@ class Report
 					$st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy);
 					break;
 				case 'DIMENSION':
-					$sql = "SELECT reference, concat(reference, ' - ', name) AS DimName FROM ".TB_PREF."dimensions ORDER BY reference";
+					$sql = "SELECT id, concat(reference, ' - ', name) AS DimName FROM ".TB_PREF."dimensions ORDER BY reference";
 					$st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy);
 					break;
 				case 'DIMENSIONS':
-					$sql = "SELECT reference, concat(reference, ' - ', name) as DimName FROM ".TB_PREF."dimensions ORDER BY reference";
+					$sql = "SELECT id, concat(reference, ' - ', name) as DimName FROM ".TB_PREF."dimensions ORDER BY reference";
 					$st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy, true, _("No Dimension Filter"), true);
 					break;
 				case 'DIMENSION1':
-					$sql = "SELECT reference, concat(reference, ' - ', name) AS DimName FROM ".TB_PREF."dimensions WHERE type_=1 ORDER BY reference";
+					$sql = "SELECT id, concat(reference, ' - ', name) AS DimName FROM ".TB_PREF."dimensions WHERE type_=1 ORDER BY reference";
 					$st .= dup_simple_codeandname_list($sql, "PARAM_$index". "_$index", $dummy);
 					break;
 				case 'DIMENSIONS1':
-					$sql = "SELECT reference, concat(reference, ' - ', name) as DimName FROM ".TB_PREF."dimensions WHERE type_=1 ORDER BY reference";
+					$sql = "SELECT id, concat(reference, ' - ', name) as DimName FROM ".TB_PREF."dimensions WHERE type_=1 ORDER BY reference";
 					$st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy, true, _("No Dimension Filter"), true);
 					break;
 				case 'DIMENSION2':
-					$sql = "SELECT reference, concat(reference, ' - ', name) AS DimName FROM ".TB_PREF."dimensions WHERE type_=2 ORDER BY reference";
+					$sql = "SELECT id, concat(reference, ' - ', name) AS DimName FROM ".TB_PREF."dimensions WHERE type_=2 ORDER BY reference";
 					$st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy);
 					break;
 				case 'DIMENSIONS2':
-					$sql = "SELECT reference, concat(reference, ' - ', name) as DimName FROM ".TB_PREF."dimensions WHERE type_=2 ORDER BY reference";
+					$sql = "SELECT id, concat(reference, ' - ', name) as DimName FROM ".TB_PREF."dimensions WHERE type_=2 ORDER BY reference";
 					$st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy, true, _("No Dimension Filter"), true);
 					break;
 				case 'CUSTOMERS_NO_FILTER':
@@ -242,9 +260,14 @@ class Report
 				case 'INVOICE':
 					$IV = _("IV");
 					$CN = _("CN");
-					$sql = "SELECT concat(".TB_PREF."debtor_trans.trans_no, '-',
-						".TB_PREF."debtor_trans.type) AS TNO, concat(".TB_PREF."debtor_trans.trans_no, if (type=10, ' $IV ', ' $CN '), ".TB_PREF."debtors_master.name) as IName
-						FROM ".TB_PREF."debtors_master, ".TB_PREF."debtor_trans WHERE (type=10 OR type=11) AND ".TB_PREF."debtors_master.debtor_no=".TB_PREF."debtor_trans.debtor_no ORDER BY ".TB_PREF."debtor_trans.trans_no DESC";
+					if ($print_invoice_no == 1)
+						$sql = "SELECT concat(".TB_PREF."debtor_trans.trans_no, '-',
+							".TB_PREF."debtor_trans.type) AS TNO, concat(".TB_PREF."debtor_trans.trans_no, if (type=10, ' $IV ', ' $CN '), ".TB_PREF."debtors_master.name) as IName
+							FROM ".TB_PREF."debtors_master, ".TB_PREF."debtor_trans WHERE (type=10 OR type=11) AND ".TB_PREF."debtors_master.debtor_no=".TB_PREF."debtor_trans.debtor_no ORDER BY ".TB_PREF."debtor_trans.trans_no DESC";
+					else		
+						$sql = "SELECT concat(".TB_PREF."debtor_trans.trans_no, '-',
+							".TB_PREF."debtor_trans.type) AS TNO, concat(".TB_PREF."debtor_trans.reference, if (type=10, ' $IV ', ' $CN '), ".TB_PREF."debtors_master.name) as IName
+							FROM ".TB_PREF."debtors_master, ".TB_PREF."debtor_trans WHERE (type=10 OR type=11) AND ".TB_PREF."debtors_master.debtor_no=".TB_PREF."debtor_trans.debtor_no ORDER BY ".TB_PREF."debtor_trans.trans_no DESC";
 					$st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy);
 					break;
 				case 'DELIVERY':
@@ -273,6 +296,12 @@ class Report
 					$sql = "SELECT stock_id, concat(stock_id, '-', description) as name FROM ".TB_PREF."stock_master WHERE (mb_flag='A' OR mb_flag='M') ORDER BY stock_id";
 					$st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy);
 					break;
+				case 'WORKORDER':
+					$sql = "SELECT ".TB_PREF."workorders.id, concat(".TB_PREF."workorders.id, '-',
+						".TB_PREF."stock_master.description) as IName
+						FROM ".TB_PREF."stock_master, ".TB_PREF."workorders WHERE ".TB_PREF."stock_master.stock_id=".TB_PREF."workorders.stock_id ORDER BY ".TB_PREF."workorders.id DESC";
+					$st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy);
+					break;
 				case 'LOCATIONS':
 					$sql = "SELECT loc_code, location_name FROM ".TB_PREF."locations ORDER BY location_name";
 					$st .= dup_simple_codeandname_list($sql, "PARAM_$index", $dummy, true, _("No Location Filter"), false);