X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=dimensions%2Finquiry%2Fsearch_dimensions.php;h=6f689ec94002d5ae7c4b86f71536f3f53641985e;hb=d353784c397bcb347ccde807c01487fe126e26a2;hp=02a78f1d10e284c274ee6b3b722754e317c5fa65;hpb=431531eebf3ba494002cfbf7ea36f9e82d4975c0;p=fa-stable.git

diff --git a/dimensions/inquiry/search_dimensions.php b/dimensions/inquiry/search_dimensions.php
index 02a78f1d..6f689ec9 100644
--- a/dimensions/inquiry/search_dimensions.php
+++ b/dimensions/inquiry/search_dimensions.php
@@ -10,19 +10,44 @@ include_once($path_to_root . "/includes/ui.inc");
 $js = "";
 if ($use_popup_windows)
 	$js .= get_js_open_window(800, 500);
-if ($use_date_picker)	
+if ($use_date_picker)
 	$js .= get_js_date_picker();
 
-if ($_GET['outstanding_only']) 
+if (isset($_GET['outstanding_only']) && $_GET['outstanding_only'])
 {
 	$outstanding_only = 1;
-	page(_("Search Outstanding Dimensionss"), false, false, "", $js);
-} 
-else 
+	page(_("Search Outstanding Dimensions"), false, false, "", $js);
+}
+else
 {
 	$outstanding_only = 0;
 	page(_("Search Dimensions"), false, false, "", $js);
 }
+//-----------------------------------------------------------------------------------
+// Ajax updates
+//
+if (get_post('SearchOrders'))
+{
+	$Ajax->activate('dim_table');
+} elseif (get_post('_OrderNumber_changed'))
+{
+	$disable = get_post('OrderNumber') !== '';
+
+	$Ajax->addDisable(true, 'FromDate', $disable);
+	$Ajax->addDisable(true, 'ToDate', $disable);
+	$Ajax->addDisable(true, 'type_', $disable);
+	$Ajax->addDisable(true, 'OverdueOnly', $disable);
+	$Ajax->addDisable(true, 'OpenOnly', $disable);
+
+	if ($disable) {
+//		$Ajax->addFocus(true, 'OrderNumber');
+		set_focus('OrderNumber');
+	} else
+//		$Ajax->addFocus(true, 'StockLocation');
+		set_focus('type_');
+
+	$Ajax->activate('dim_table');
+}
 
 //--------------------------------------------------------------------------------------
 
@@ -36,22 +61,22 @@ start_form(false, true, $_SERVER['PHP_SELF'] ."?outstanding_only=" . $outstandin
 start_table("class='tablestyle_noborder'");
 start_row();
 
-ref_cells(_("Reference:"), 'OrderNumber', null);
+ref_cells(_("Reference:"), 'OrderNumber', '',null, '', true);
 
-number_list_cells(_("Type"), 'type_', null, 0, 2);
-date_cells(_("From:"), 'FromDate', null, 0, 0, -5);
+number_list_cells(_("Type"), 'type_', null, 1, 2, _("All"));
+date_cells(_("From:"), 'FromDate', '', null, 0, 0, -5);
 date_cells(_("To:"), 'ToDate');
 
 check_cells( _("Only Overdue:"), 'OverdueOnly', null);
 
-if (!$outstanding_only) 
+if (!$outstanding_only)
 {
    	check_cells( _("Only Open:"), 'OpenOnly', null);
-} 
+}
 else
 	$_POST['OpenOnly'] = 1;
 
-submit_cells('SearchOrders', _("Search"));
+submit_cells('SearchOrders', _("Search"), '', '', true);
 
 end_row();
 end_table();
@@ -62,39 +87,40 @@ $dim = get_company_pref('use_dimension');
 
 $sql = "SELECT * FROM ".TB_PREF."dimensions WHERE id > 0";
 
-if ($dim == 1)
-	$sql .= " AND type_=1";
-	
-if (isset($_POST['OpenOnly'])) 
+if (isset($_POST['OrderNumber']) && $_POST['OrderNumber'] != "")
 {
-   	$sql .= " AND closed=0";
-}
+	$sql .= " AND reference LIKE '%". $_POST['OrderNumber'] . "%'";
+} else {
 
-if (isset($_POST['type_']) && ($_POST['type_'] > 0)) 
-{
-   	$sql .= " AND type_=" . $_POST['type_'];
-}
+	if ($dim == 1)
+		$sql .= " AND type_=1";
 
-if (isset($_POST['OrderNumber']) && $_POST['OrderNumber'] != "") 
-{
-	$sql .= " AND reference LIKE '%". $_POST['OrderNumber'] . "%'";
-}
+	if (isset($_POST['OpenOnly']))
+	{
+   		$sql .= " AND closed=0";
+	}
 
-if (isset($_POST['OverdueOnly'])) 
-{
-	$today = date2sql(Today());
+	if (isset($_POST['type_']) && ($_POST['type_'] > 0))
+	{
+   		$sql .= " AND type_=" . $_POST['type_'];
+	}
 
-   	$sql .= " AND due_date < '$today' ";
-}
+	if (isset($_POST['OverdueOnly']))
+	{
+		$today = date2sql(Today());
 
-$sql .= " AND date_ >= '" . date2sql($_POST['FromDate']) . "'
-	AND date_ <= '" . date2sql($_POST['ToDate']) . "'";
+	   	$sql .= " AND due_date < '$today' ";
+	}
 
+	$sql .= " AND date_ >= '" . date2sql($_POST['FromDate']) . "'
+		AND date_ <= '" . date2sql($_POST['ToDate']) . "'";
+}
 $sql .= " ORDER BY due_date";
 
 $result = db_query($sql,"could not query dimensions");
 
-start_table("$table_style width=80%"); 
+div_start('dim_table');
+start_table("$table_style width=80%");
 
 if (!$outstanding_only)
 	$th = array(_("#"), _("Reference"), _("Name"), _("Type"), _("Date"),
@@ -106,28 +132,28 @@ table_header($th);
 $j = 1;
 $k = 0;
 
-while ($myrow = db_fetch($result)) 
+while ($myrow = db_fetch($result))
 {
-	$sql = "SELECT SUM(amount) FROM ".TB_PREF."gl_trans WHERE tran_date >= '" . 
-		date2sql($_POST['FromDate']) . "' AND 
-		tran_date <= '" . date2sql($_POST['ToDate']) . "' AND dimension_id = " . 
-		$myrow['id'];
+	$sql = "SELECT SUM(amount) FROM ".TB_PREF."gl_trans WHERE tran_date >= '" .
+		date2sql($_POST['FromDate']) . "' AND
+		tran_date <= '" . date2sql($_POST['ToDate']) . "' AND (dimension_id = " .
+		$myrow['id']." OR dimension2_id = " .$myrow['id'].")";
 	$res = db_query($sql, "Transactions could not be calculated");
 	$row = db_fetch_row($res);
-		
+
 	if ($k == 1)
 	{
 		$row_text = "class='oddrow'";
 		$k = 0;
-	} 
-	else 
+	}
+	else
 	{
 		$row_text = "class='evenrow'";
 		$k++;
 	}
 
 	// check if it's an overdue work order
-	if (date_diff(Today(), sql2date($myrow["due_date"]), "d") > 0) 
+	if (date_diff(Today(), sql2date($myrow["due_date"]), "d") > 0)
 	{
 		$row_text = "class='overduebg'";
 	}
@@ -145,8 +171,8 @@ while ($myrow = db_fetch($result))
 	if (!$outstanding_only)
 		label_cell(($myrow["closed"] ? _("Yes") : _("No")));
 	amount_cell($row[0]);
-	if ($myrow["closed"] == 0) 
-		label_cell("<a href='$mpage'>" . _("Edit") . "</a>");
+
+	label_cell($myrow["closed"] == 0 ? ("<a href='$mpage'>" . _("Edit") . "</a>") :'');
 	end_row();
 
 	$j++;
@@ -160,7 +186,7 @@ while ($myrow = db_fetch($result))
 //end of while loop
 
 end_table(1);
-
+div_end();
 //---------------------------------------------------------------------------------
 
 end_page();