projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Show also Upcoming Purchase Invoices - in Dashboard. Fixed.
[fa-stable.git]
/
purchasing
/
inquiry
/
po_search.php
diff --git
a/purchasing/inquiry/po_search.php
b/purchasing/inquiry/po_search.php
index cf9a80b6dac6ebe1230ba1c9ae345fbe9442f67f..efd650752943570cc799e37c4fe2154021840b2d 100644
(file)
--- a/
purchasing/inquiry/po_search.php
+++ b/
purchasing/inquiry/po_search.php
@@
-18,7
+18,7
@@
include($path_to_root . "/purchasing/includes/purchasing_ui.inc");
include_once($path_to_root . "/reporting/includes/reporting.inc");
$js = "";
include_once($path_to_root . "/reporting/includes/reporting.inc");
$js = "";
-if ($use_popup_windows)
+if ($
SysPrefs->
use_popup_windows)
$js .= get_js_open_window(900, 500);
if (user_use_date_picker())
$js .= get_js_date_picker();
$js .= get_js_open_window(900, 500);
if (user_use_date_picker())
$js .= get_js_date_picker();
@@
-61,7
+61,7
@@
start_table(TABLESTYLE_NOBORDER);
start_row();
ref_cells(_("#:"), 'order_number', '',null, '', true);
start_row();
ref_cells(_("#:"), 'order_number', '',null, '', true);
-date_cells(_("from:"), 'OrdersAfterDate', '', null, -
$_SESSION["wa_current_user"]->prefs->
transaction_days());
+date_cells(_("from:"), 'OrdersAfterDate', '', null, -
user_
transaction_days());
date_cells(_("to:"), 'OrdersToDate');
locations_list_cells(_("Location:"), 'StockLocation', null, true);
date_cells(_("to:"), 'OrdersToDate');
locations_list_cells(_("Location:"), 'StockLocation', null, true);
@@
-86,13
+86,12
@@
function trans_view($trans)
function edit_link($row)
{
function edit_link($row)
{
- return pager_link( _("Edit"),
- "/purchasing/po_entry_items.php?ModifyOrderNumber=" . $row["order_no"], ICON_EDIT);
+ return trans_editor_link(ST_PURCHORDER, $row["order_no"]);
}
function prt_link($row)
{
}
function prt_link($row)
{
- return print_document_link($row['order_no'], _("Print"), true,
18
, ICON_PRINT);
+ return print_document_link($row['order_no'], _("Print"), true,
ST_PURCHORDER
, ICON_PRINT);
}
function receive_link($row)
}
function receive_link($row)
@@
-107,14
+106,9
@@
function check_overdue($row)
}
//---------------------------------------------------------------------------------------------
}
//---------------------------------------------------------------------------------------------
-if (isset($_POST['order_number']) && ($_POST['order_number'] != ""))
-{
- $order_number = $_POST['order_number'];
-}
-
//figure out the sql required from the inputs available
//figure out the sql required from the inputs available
-$sql = get_sql_for_po_search(
$_POST['OrdersAfterDate'], $_POST['OrdersToDate'], $_POST['supplier_id']
,
- $_POST['
StockLocation']
);
+$sql = get_sql_for_po_search(
get_post('OrdersAfterDate'), get_post('OrdersToDate'), get_post('supplier_id'), get_post('StockLocation')
,
+ $_POST['
order_number'], get_post('SelectStockFromList')
);
//$result = db_query($sql,"No orders were returned");
//$result = db_query($sql,"No orders were returned");
@@
-129,11
+123,11
@@
$cols = array(
_("Currency") => array('align'=>'center'),
_("Order Total") => 'amount',
array('insert'=>true, 'fun'=>'edit_link'),
_("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')
+ array('insert'=>true, 'fun'=>'
receive
_link'),
+ array('insert'=>true, 'fun'=>'
prt
_link')
);
);
-if (get_post('StockLocation') !=
$all_items
) {
+if (get_post('StockLocation') !=
ALL_TEXT
) {
$cols[_("Location")] = 'skip';
}
$cols[_("Location")] = 'skip';
}
@@
-146,4
+140,3
@@
display_db_pager($table);
end_form();
end_page();
end_form();
end_page();
-?>