X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=reporting%2Fincludes%2Freports_classes.inc;h=647209f8224a99e46b92fa4c1a19964f99c4ecfb;hb=9481e23e6d03f39f7d9e745f86bd1be5f703b96d;hp=dd2e069f223ce9396a1852f5e226e52284aed02b;hpb=5e63c6ace55729bbb5ee3b060035a25a4426eb0a;p=fa-stable.git

diff --git a/reporting/includes/reports_classes.inc b/reporting/includes/reports_classes.inc
index dd2e069f..647209f8 100644
--- a/reporting/includes/reports_classes.inc
+++ b/reporting/includes/reports_classes.inc
@@ -18,6 +18,7 @@ define('RC_MANUFACTURE', 3);
 define('RC_DIMENSIONS', 4);
 define('RC_BANKING', 5);
 define('RC_GL', 6);
+define('RC_FIXEDASSETS', 7);
 
 class BoxReports
 {
@@ -78,7 +79,7 @@ class BoxReports
 				."$acc[1]>$acc[0]</a> <br>";
 
 			$style = $class_id==$cur_class ? '' : "style='display:none'";
-			$st_reports .= "<table class='repclass' id='TAB_" . $class_id ."' $style cellpadding=0 cellspacing=0 border=0 width='100%'><tr><td><b>" . _("Reports For Class: ") . "&nbsp;$name</b></td></tr>\n";
+			$st_reports .= "<table class='repclass' id='TAB_" . $class_id ."' $style cellpadding='0' cellspacing='0' border='0' width='100%'><tr><td><b>" . _("Reports For Class: ") . "&nbsp;$name</b></td></tr>\n";
 			foreach($this->ar_reports[$class_id] as $rep_id => $report)
 			{
 				$acc = access_string($report->name);
@@ -211,7 +212,7 @@ class BoxReports
 							}
 						}
 					}
-					else // saved parameters 2010-10-16 Joe Hunt
+					else // saved parameters
 						$date = $_POST[$name];
 					$st = "<input type='text' name='$name' value='$date'>";
 					if (user_use_date_picker())
@@ -219,7 +220,7 @@ class BoxReports
 						$calc_image = (file_exists("$path_to_root/themes/".user_theme()."/images/cal.gif")) ? 
 							"$path_to_root/themes/".user_theme()."/images/cal.gif" : "$path_to_root/themes/default/images/cal.gif";
 						$st .= "<a href=\"javascript:date_picker(document.forms[0].$name);\">"
-						. "	<img src='$calc_image' width='16' height='16' border='0' alt='"._('Click Here to Pick up the date')."'></a>\n";
+						. "	<img src='$calc_image' style='vertical-align:middle;padding-bottom:4px;width:16px;height:16px;border:0;' alt='"._('Click Here to Pick up the date')."'></a>\n";
 					}	
 					return $st;
 					break;
@@ -264,7 +265,7 @@ class BoxReports
 
 				case 'TEXTBOX':
 					$value = (isset($_POST[$name]) ? $_POST[$name] : "");
-					return "<textarea rows=4 cols=30 name='$name'>$value</textarea>";
+					return "<textarea rows=4 cols=30 maxlength=130 name='$name'>$value</textarea>";
 
 				case 'ACCOUNTS': // not used
 					return gl_account_types_list($name, null, _("No Account Group Filter"), true);
@@ -315,69 +316,86 @@ class BoxReports
 				case 'INVOICE':
 					$IV = $type_shortcuts[ST_SALESINVOICE];
 					$ref = ($SysPrefs->print_invoice_no() == 1 ? "trans_no" : "reference");
-					$sql = "SELECT concat(".TB_PREF."debtor_trans.trans_no, '-',
-						".TB_PREF."debtor_trans.type) AS TNO, concat('$IV ', ".TB_PREF."debtor_trans.$ref,' ', ".TB_PREF."debtors_master.name) as IName
-						FROM ".TB_PREF."debtors_master, ".TB_PREF."debtor_trans WHERE type=".ST_SALESINVOICE." AND ".TB_PREF."debtors_master.debtor_no=".TB_PREF."debtor_trans.debtor_no ORDER BY ".TB_PREF."debtor_trans.trans_no DESC";
+					$sql = "SELECT concat(debtor_trans.trans_no, '-', debtor_trans.type) AS TNO,
+								concat('$IV ', debtor_trans.$ref,' ', debtor.name) as IName
+						FROM ".TB_PREF."debtors_master debtor,"
+							.TB_PREF."debtor_trans debtor_trans
+						WHERE type=".ST_SALESINVOICE." AND debtor.debtor_no=debtor_trans.debtor_no
+						ORDER BY debtor_trans.trans_no DESC";
 					return combo_input($name, '', $sql, 'TNO', 'IName',array('order'=>false));
 
 				case 'CREDIT':
 					$CN = $type_shortcuts[ST_CUSTCREDIT];
 					$ref = ($SysPrefs->print_invoice_no() == 1 ? "trans_no" : "reference");
-					$sql = "SELECT concat(".TB_PREF."debtor_trans.trans_no, '-',
-						".TB_PREF."debtor_trans.type) AS TNO, concat('$CN ', ".TB_PREF."debtor_trans.$ref,' ', ".TB_PREF."debtors_master.name) as IName
-						FROM ".TB_PREF."debtors_master, ".TB_PREF."debtor_trans WHERE type=".ST_CUSTCREDIT." AND ".TB_PREF."debtors_master.debtor_no=".TB_PREF."debtor_trans.debtor_no ORDER BY ".TB_PREF."debtor_trans.trans_no DESC";
+					$sql = "SELECT concat(debtor_trans.trans_no, '-', debtor_trans.type) AS TNO,
+								concat('$CN ', debtor_trans.$ref,' ', debtor.name) as IName
+						FROM ".TB_PREF."debtors_master debtor,"
+							.TB_PREF."debtor_trans debtor_trans
+						WHERE type=".ST_CUSTCREDIT." AND debtor.debtor_no=debtor_trans.debtor_no
+						ORDER BY debtor_trans.trans_no DESC";
 					return combo_input($name, '', $sql, 'TNO', 'IName',array('order'=>false));
 
 				case 'DELIVERY':
 					$DN = $type_shortcuts[ST_CUSTDELIVERY];
-					$sql = "SELECT
-					concat(".TB_PREF."debtor_trans.trans_no, '-', ".TB_PREF."debtor_trans.type) AS TNO, concat(".TB_PREF."debtor_trans.trans_no, ' $DN ',
-					 ".TB_PREF."debtors_master.name) as IName
-						FROM ".TB_PREF."debtors_master, ".TB_PREF."debtor_trans
-						WHERE type=".ST_CUSTDELIVERY." AND ".TB_PREF."debtors_master.debtor_no=".
-						TB_PREF."debtor_trans.debtor_no ORDER BY ".TB_PREF."debtor_trans.trans_no DESC";
+					$sql = "SELECT	concat(debtor_trans.trans_no, '-', debtor_trans.type) AS TNO,
+								concat(debtor_trans.trans_no, ' $DN ', debtor.name) as IName
+						FROM ".TB_PREF."debtors_master debtor,"
+							.TB_PREF."debtor_trans debtor_trans
+						WHERE type=".ST_CUSTDELIVERY." AND debtor.debtor_no=debtor_trans.debtor_no
+						ORDER BY debtor_trans.trans_no DESC";
 					return combo_input($name, '', $sql, 'TNO', 'IName',array('order'=>false));
 
 				case 'ORDERS':
 					$ref = ($SysPrefs->print_invoice_no() == 1 ? "order_no" : "reference");
-					$sql = "SELECT ".TB_PREF."sales_orders.order_no, concat(".TB_PREF."sales_orders.$ref, '-',
-						".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=".ST_SALESORDER." ORDER BY ".TB_PREF."sales_orders.order_no DESC";
+					$sql = "SELECT sorder.order_no, concat(sorder.$ref, '-', debtor.name) as IName
+						FROM ".TB_PREF."debtors_master debtor,"
+							.TB_PREF."sales_orders sorder
+						WHERE debtor.debtor_no=sorder.debtor_no	AND sorder.trans_type=".ST_SALESORDER
+						." ORDER BY sorder.order_no DESC";
 					return combo_input($name, '', $sql, 'order_no', 'IName',array('order'=>false));
 
 				case 'QUOTATIONS':
 					$ref = ($SysPrefs->print_invoice_no() == 1 ? "order_no" : "reference");
-					$sql = "SELECT ".TB_PREF."sales_orders.order_no, concat(".TB_PREF."sales_orders.$ref, '-',
-						".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=".ST_SALESQUOTE." ORDER BY ".TB_PREF."sales_orders.order_no DESC";
+					$sql = "SELECT sorder.order_no, concat(sorder.$ref, '-', debtor.name) as IName
+						FROM ".TB_PREF."debtors_master debtor,"
+							.TB_PREF."sales_orders sorder
+						WHERE debtor.debtor_no=sorder.debtor_no	AND sorder.trans_type=".ST_SALESQUOTE
+							." ORDER BY sorder.order_no DESC";
 					return combo_input($name, '', $sql, 'order_no', 'IName',array('order'=>false));
 
 				case 'PO':
 					$ref = ($SysPrefs->print_invoice_no() == 1 ? "order_no" : "reference");
-					$sql = "SELECT ".TB_PREF."purch_orders.order_no, concat(".TB_PREF."purch_orders.$ref, '-',
-						".TB_PREF."suppliers.supp_name) as IName
-						FROM ".TB_PREF."suppliers, ".TB_PREF."purch_orders WHERE ".TB_PREF."suppliers.supplier_id=".TB_PREF."purch_orders.supplier_id ORDER BY ".TB_PREF."purch_orders.order_no DESC";
+					$sql = "SELECT po.order_no, concat(po.$ref, '-', supplier.supp_name) as IName
+						FROM ".TB_PREF."suppliers supplier,"
+							.TB_PREF."purch_orders po
+						WHERE supplier.supplier_id=po.supplier_id
+						ORDER BY po.order_no DESC";
 					return combo_input($name, '', $sql, 'order_no', 'IName',array('order'=>false));
 
 				case 'REMITTANCE':
 					$BP = $type_shortcuts[ST_BANKPAYMENT];
 					$SP = $type_shortcuts[ST_SUPPAYMENT];
 					$CN = $type_shortcuts[ST_SUPPCREDIT];
-					$ref = ($print_invoice_no == 1 ? "trans_no" : "reference");
-					$sql = "SELECT concat(".TB_PREF."supp_trans.trans_no, '-',
-						".TB_PREF."supp_trans.type) AS TNO, concat(".TB_PREF."supp_trans.$ref, if (type=".ST_BANKPAYMENT.", ' $BP ', if (type=".ST_SUPPAYMENT.", ' $SP ', ' $CN ')), ".TB_PREF."suppliers.supp_name) as IName
-						FROM ".TB_PREF."suppliers, ".TB_PREF."supp_trans WHERE (type=".ST_BANKPAYMENT." OR type=".ST_SUPPAYMENT." OR type=".ST_SUPPCREDIT.") AND ".TB_PREF."suppliers.supplier_id=".TB_PREF."supp_trans.supplier_id ORDER BY ".TB_PREF."supp_trans.trans_no DESC";
+					$ref = ($SysPrefs->print_invoice_no() == 1 ? "trans_no" : "reference");
+					$sql = "SELECT concat(trans.trans_no, '-',trans.type) AS TNO,
+								concat(trans.$ref, IF(type=".ST_BANKPAYMENT.", ' $BP ', IF(type=".ST_SUPPAYMENT.", ' $SP ', ' $CN ')), supplier.supp_name) as IName
+							FROM ".TB_PREF."suppliers supplier, "
+								.TB_PREF."supp_trans trans
+							WHERE type IN(".ST_BANKPAYMENT.",".ST_SUPPAYMENT.",".ST_SUPPCREDIT.")
+								AND supplier.supplier_id=trans.supplier_id
+							ORDER BY trans.trans_no DESC";
 					return combo_input($name, '', $sql, 'TNO', 'IName',array('order'=>false));
 
 				case 'RECEIPT':
 					$BD = $type_shortcuts[ST_BANKDEPOSIT];
 					$CP = $type_shortcuts[ST_CUSTPAYMENT];
 					$ref = ($SysPrefs->print_invoice_no() == 1 ? "trans_no" : "reference");
-					$sql = "SELECT concat(".TB_PREF."debtor_trans.trans_no, '-',
-						".TB_PREF."debtor_trans.type) AS TNO, concat(".TB_PREF."debtor_trans.$ref, if (type=".ST_BANKDEPOSIT.", ' $BD ', ' $CP '), ".TB_PREF."debtors_master.name) as IName
-						FROM ".TB_PREF."debtors_master, ".TB_PREF."debtor_trans WHERE (type=".ST_BANKDEPOSIT." OR type=".ST_CUSTPAYMENT." OR type=".ST_CUSTCREDIT.") AND ".TB_PREF."debtors_master.debtor_no=".TB_PREF."debtor_trans.debtor_no ORDER BY ".TB_PREF."debtor_trans.trans_no DESC";
+					$sql = "SELECT concat(trans.trans_no, '-', trans.type) AS TNO,
+								concat(trans.$ref, IF(type=".ST_BANKDEPOSIT.", ' $BD ', ' $CP '), debtor.name) as IName
+						FROM ".TB_PREF."debtors_master debtor,"
+							.TB_PREF."debtor_trans trans
+						WHERE type IN(".ST_BANKDEPOSIT.",".ST_CUSTPAYMENT.",".ST_CUSTCREDIT.") AND debtor.debtor_no=trans.debtor_no
+						ORDER BY trans.trans_no DESC";
 					return combo_input($name, '', $sql, 'TNO', 'IName',array('order'=>false));
 
 				case 'ITEMS':
@@ -390,17 +408,24 @@ class BoxReports
 					return stock_purchasable_items_list($name, null, true);
 				
 				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";
+					$sql = "SELECT wo.id, concat(wo.id, '-', item.description) as IName
+						FROM ".TB_PREF."stock_master item,"
+							.TB_PREF."workorders wo
+						WHERE item.stock_id=wo.stock_id
+						ORDER BY wo.id DESC";
 					return combo_input($name, '', $sql, 'id', 'IName',array('order'=>false));
 
 				case 'LOCATIONS':
 					return  locations_list($name, null, _("No Location Filter"));
+				case 'FLOCATIONS':
+					return  locations_list($name, null, _("No Location Filter"), false, true);
 
 				case 'CATEGORIES':
 					return stock_categories_list($name, null, _("No Category Filter"));
-
+				case 'FCATEGORIES':
+					return stock_categories_list($name, null, _("No Category Filter"), false, true);
+				case 'FCLASS':
+					return fixed_asset_classes_list($name, null, _("No Class Filter"), false);
 				case 'SALESTYPES':
 					return sales_types_list($name);
 
@@ -423,7 +448,6 @@ class BoxReports
 						$tag_type = TAG_ACCOUNT;
 					else
 						$tag_type = TAG_DIMENSION;
-					//return tag_list($name, 5, $tag_type, true, false, _("No tags"));
 					return tag_list($name, 5, $tag_type, true);
 
 			}