X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=inline;f=purchasing%2Finquiry%2Fpo_search.php;h=220b1e1a325d62e2c36d2452ee939ca1dd268f34;hb=61ba1cc9406056fdb2c22bd253521fae45e660c0;hp=b4bac8022719dd13c91c8c3e2247d67a38ff2612;hpb=c09be0dad6b05131e240349a375af7a4b7bf3444;p=fa-stable.git
diff --git a/purchasing/inquiry/po_search.php b/purchasing/inquiry/po_search.php
index b4bac802..220b1e1a 100644
--- a/purchasing/inquiry/po_search.php
+++ b/purchasing/inquiry/po_search.php
@@ -1,7 +1,17 @@
.
+***********************************************************************/
+$page_security = 'SA_SUPPTRANSVIEW';
+$path_to_root = "../..";
+include($path_to_root . "/includes/db_pager.inc");
include($path_to_root . "/includes/session.inc");
include($path_to_root . "/purchasing/includes/purchasing_ui.inc");
@@ -12,7 +22,7 @@ if ($use_popup_windows)
$js .= get_js_open_window(900, 500);
if ($use_date_picker)
$js .= get_js_date_picker();
-page(_("Search Outstanding Purchase Orders"), false, false, "", $js);
+page(_($help_context = "Search Outstanding Purchase Orders"), false, false, "", $js);
if (isset($_GET['order_number']))
{
@@ -45,9 +55,9 @@ if (get_post('SearchOrders'))
//---------------------------------------------------------------------------------------------
-start_form(false, true);
+start_form();
-start_table("class='tablestyle_noborder'");
+start_table(TABLESTYLE_NOBORDER);
start_row();
ref_cells(_("#:"), 'order_number', '',null, '', true);
@@ -55,15 +65,44 @@ date_cells(_("from:"), 'OrdersAfterDate', '', null, -30);
date_cells(_("to:"), 'OrdersToDate');
locations_list_cells(_("Location:"), 'StockLocation', null, true);
+end_row();
+end_table();
+
+start_table(TABLESTYLE_NOBORDER);
+start_row();
stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true);
-submit_cells('SearchOrders', _("Search"),'',_('Select documents'), true);
+submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default');
end_row();
-end_table();
+end_table(1);
+//---------------------------------------------------------------------------------------------
+function trans_view($trans)
+{
+ return get_trans_view_str(ST_PURCHORDER, $trans["order_no"]);
+}
-end_form();
+function edit_link($row)
+{
+ return pager_link( _("Edit"),
+ "/purchasing/po_entry_items.php?ModifyOrderNumber=" . $row["order_no"], ICON_EDIT);
+}
+
+function prt_link($row)
+{
+ return print_document_link($row['order_no'], _("Print"), true, 18, ICON_PRINT);
+}
+function receive_link($row)
+{
+ return pager_link( _("Receive"),
+ "/purchasing/po_receive_items.php?PONumber=" . $row["order_no"], ICON_RECEIVE);
+}
+
+function check_overdue($row)
+{
+ return $row['OverDue']==1;
+}
//---------------------------------------------------------------------------------------------
if (isset($_POST['order_number']) && ($_POST['order_number'] != ""))
@@ -81,114 +120,37 @@ else
unset($selected_stock_item);
}
-$today = date2sql(Today());
-
//figure out the sql required from the inputs available
-$sql = "SELECT ".TB_PREF."purch_orders.order_no, ".TB_PREF."suppliers.supp_name, ".TB_PREF."purch_orders.into_stock_location,
- ".TB_PREF."purch_orders.ord_date, ".TB_PREF."purch_orders.requisition_no, ".TB_PREF."purch_orders.reference,
- ".TB_PREF."suppliers.curr_code, ".TB_PREF."locations.location_name,
- Sum(".TB_PREF."purch_order_details.unit_price*".TB_PREF."purch_order_details.quantity_ordered) AS OrderValue,
- Sum(".TB_PREF."purch_order_details.delivery_date < '" . $today. "'
- AND (".TB_PREF."purch_order_details.quantity_ordered > ".TB_PREF."purch_order_details.quantity_received)) As OverDue
- FROM ".TB_PREF."purch_orders, ".TB_PREF."purch_order_details, ".TB_PREF."suppliers, ".TB_PREF."locations
- WHERE ".TB_PREF."purch_orders.order_no = ".TB_PREF."purch_order_details.order_no
- AND ".TB_PREF."purch_orders.supplier_id = ".TB_PREF."suppliers.supplier_id
- AND ".TB_PREF."locations.loc_code = ".TB_PREF."purch_orders.into_stock_location
- AND (".TB_PREF."purch_order_details.quantity_ordered > ".TB_PREF."purch_order_details.quantity_received) ";
-
-if (isset($order_number) && $order_number != "")
-{
- $sql .= "AND ".TB_PREF."purch_orders.reference LIKE '%". $order_number . "%'";
-}
-else
-{
-
- $data_after = date2sql($_POST['OrdersAfterDate']);
- $data_before = date2sql($_POST['OrdersToDate']);
-
- $sql .= " AND ".TB_PREF."purch_orders.ord_date >= '$data_after'";
- $sql .= " AND ".TB_PREF."purch_orders.ord_date <= '$data_before'";
-
- if (isset($_POST['StockLocation']) && $_POST['StockLocation'] != $all_items)
- {
- $sql .= " AND ".TB_PREF."purch_orders.into_stock_location = '". $_POST['StockLocation'] . "' ";
- }
-
- if (isset($selected_stock_item))
- {
- $sql .= " AND ".TB_PREF."purch_order_details.item_code='". $selected_stock_item ."' ";
- }
-} //end not order number selected
-
-$sql .= " GROUP BY ".TB_PREF."purch_orders.order_no";
+$sql = get_sql_for_po_search();
-$result = db_query($sql,"No orders were returned");
-
-print_hidden_script(18);
+//$result = db_query($sql,"No orders were returned");
/*show a table of the orders returned by the sql */
+$cols = array(
+ _("#") => array('fun'=>'trans_view', 'ord'=>''),
+ _("Reference"),
+ _("Supplier") => array('ord'=>''),
+ _("Location"),
+ _("Supplier's Reference"),
+ _("Order Date") => array('name'=>'ord_date', 'type'=>'date', 'ord'=>'desc'),
+ _("Currency") => array('align'=>'center'),
+ _("Order Total") => 'amount',
+ array('insert'=>true, 'fun'=>'edit_link'),
+ array('insert'=>true, 'fun'=>'prt_link'),
+ array('insert'=>true, 'fun'=>'receive_link')
+);
+
+if (get_post('StockLocation') != $all_items) {
+ $cols[_("Location")] = 'skip';
+}
-div_start('orders_tbl');
-start_table("$table_style colspan=7 width=80%");
-
-if (isset($_POST['StockLocation']) && $_POST['StockLocation'] == $all_items)
- $th = array(_("#"), _("Reference"), _("Supplier"), _("Location"),
- _("Supplier's Reference"), _("Order Date"), _("Currency"), _("Order Total"),"","","");
-else
- $th = array(_("#"), _("Reference"), _("Supplier"),
- _("Supplier's Reference"), _("Order Date"), _("Currency"), _("Order Total"),"","","");
-
-table_header($th);
-
-$j = 1;
-$k = 0; //row colour counter
-$overdue_items = false;
-while ($myrow = db_fetch($result))
-{
+$table =& new_db_pager('orders_tbl', $sql, $cols);
+$table->set_marker('check_overdue', _("Marked orders have overdue items."));
- if ($myrow["OverDue"] == 1)
- {
- start_row("class='overduebg'");
- $overdue_items = true;
- }
- else
- {
- alt_table_row_color($k);
- }
-
- $modify = "$path_to_root/purchasing/po_entry_items.php?" . SID . "ModifyOrderNumber=" . $myrow["order_no"];
- $receive = "$path_to_root/purchasing/po_receive_items.php?" . SID . "PONumber=" . $myrow["order_no"];
-
- $date = sql2date($myrow["ord_date"]);
-
- label_cell(get_trans_view_str(systypes::po(), $myrow["order_no"]));
- label_cell($myrow["reference"]);
- label_cell($myrow["supp_name"]);
- if (isset($_POST['StockLocation']) && $_POST['StockLocation'] == $all_items)
- label_cell($myrow["location_name"]);
- label_cell($myrow["requisition_no"]);
- label_cell($date);
- label_cell($myrow["curr_code"]);
- amount_cell($myrow["OrderValue"]);
- label_cell("" . _("Edit") . "");
- label_cell(print_document_link($myrow['order_no'], _("Print")));
- label_cell("" . _("Receive") . "");
- end_row();
-
- $j++;
- If ($j == 12)
- {
- $j = 1;
- table_header($th);
- }
-//end of page full new headings if
-}
-//end of while loop
+$table->width = "80%";
-end_table();
+display_db_pager($table);
-if ($overdue_items)
- display_note(_("Marked orders have overdue items."), 0, 1, "class='overduefg'");
-div_end();
+end_form();
end_page();
?>