projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moved all SQL statements from PHP files into relevant *_db.inc files.
[fa-stable.git]
/
purchasing
/
inquiry
/
po_search_completed.php
diff --git
a/purchasing/inquiry/po_search_completed.php
b/purchasing/inquiry/po_search_completed.php
index cacc3baee41b5fa5d9bdb64a2474b7f003e0a429..1632f5b49de15f440d70011bdffddec4ba1231a1 100644
(file)
--- a/
purchasing/inquiry/po_search_completed.php
+++ b/
purchasing/inquiry/po_search_completed.php
@@
-1,15
+1,15
@@
<?php
/**********************************************************************
Copyright (C) FrontAccounting, LLC.
<?php
/**********************************************************************
Copyright (C) FrontAccounting, LLC.
- Released under the terms of the GNU
Affero General Public License,
- AGPL, as published by the Free Software Foundation, either version
-
3
of the License, or (at your option) any later version.
+ 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.
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/
a
gpl-3.0.html>.
+ See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
***********************************************************************/
***********************************************************************/
-$page_security =
2
;
+$page_security =
'SA_SUPPTRANSVIEW'
;
$path_to_root="../..";
include($path_to_root . "/includes/db_pager.inc");
include($path_to_root . "/includes/session.inc");
$path_to_root="../..";
include($path_to_root . "/includes/db_pager.inc");
include($path_to_root . "/includes/session.inc");
@@
-21,7
+21,7
@@
if ($use_popup_windows)
$js .= get_js_open_window(900, 500);
if ($use_date_picker)
$js .= get_js_date_picker();
$js .= get_js_open_window(900, 500);
if ($use_date_picker)
$js .= get_js_date_picker();
-page(_("Search Purchase Orders"), false, false, "", $js);
+page(_(
$help_context =
"Search Purchase Orders"), false, false, "", $js);
if (isset($_GET['order_number']))
{
if (isset($_GET['order_number']))
{
@@
-53,7
+53,7
@@
if (get_post('SearchOrders'))
}
//---------------------------------------------------------------------------------------------
}
//---------------------------------------------------------------------------------------------
-start_form(
false, true
);
+start_form();
start_table("class='tablestyle_noborder'");
start_row();
start_table("class='tablestyle_noborder'");
start_row();
@@
-66,10
+66,9
@@
locations_list_cells(_("into location:"), 'StockLocation', null, true);
stock_items_list_cells(_("for item:"), 'SelectStockFromList', null, true);
stock_items_list_cells(_("for item:"), 'SelectStockFromList', null, true);
-submit_cells('SearchOrders', _("Search"),'',_('Select documents'),
true
);
+submit_cells('SearchOrders', _("Search"),'',_('Select documents'),
'default'
);
end_row();
end_table();
end_row();
end_table();
-end_form();
//---------------------------------------------------------------------------------------------
if (isset($_POST['order_number']))
{
//---------------------------------------------------------------------------------------------
if (isset($_POST['order_number']))
{
@@
-77,7
+76,7
@@
if (isset($_POST['order_number']))
}
if (isset($_POST['SelectStockFromList']) && ($_POST['SelectStockFromList'] != "") &&
}
if (isset($_POST['SelectStockFromList']) && ($_POST['SelectStockFromList'] != "") &&
- ($_POST['SelectStockFromList'] !=
reserved_words::get_all()
))
+ ($_POST['SelectStockFromList'] !=
ALL_TEXT
))
{
$selected_stock_item = $_POST['SelectStockFromList'];
}
{
$selected_stock_item = $_POST['SelectStockFromList'];
}
@@
-89,7
+88,14
@@
else
//---------------------------------------------------------------------------------------------
function trans_view($trans)
{
//---------------------------------------------------------------------------------------------
function trans_view($trans)
{
- return get_trans_view_str(systypes::po(), $trans["order_no"]);
+ return get_trans_view_str(ST_PURCHORDER, $trans["order_no"]);
+}
+
+function edit_link($row)
+{
+ return pager_link( _("Edit"),
+ "/purchasing/po_entry_items.php?" . SID
+ . "ModifyOrderNumber=" . $row["order_no"], ICON_EDIT);
}
function prt_link($row)
}
function prt_link($row)
@@
-119,7
+125,7
@@
$sql = "SELECT
if (isset($order_number) && $order_number != "")
{
if (isset($order_number) && $order_number != "")
{
- $sql .= "AND porder.reference LIKE
'%". $order_number . "%'"
;
+ $sql .= "AND porder.reference LIKE
".db_escape('%'. $order_number . '%')
;
}
else
{
}
else
{
@@
-130,13
+136,13
@@
else
$sql .= " AND porder.ord_date >= '$data_after'";
$sql .= " AND porder.ord_date <= '$date_before'";
$sql .= " AND porder.ord_date >= '$data_after'";
$sql .= " AND porder.ord_date <= '$date_before'";
- if (isset($_POST['StockLocation']) && $_POST['StockLocation'] !=
reserved_words::get_all()
)
+ if (isset($_POST['StockLocation']) && $_POST['StockLocation'] !=
ALL_TEXT
)
{
{
- $sql .= " AND porder.into_stock_location =
'". $_POST['StockLocation'] . "' "
;
+ $sql .= " AND porder.into_stock_location =
".db_escape($_POST['StockLocation'])
;
}
if (isset($selected_stock_item))
{
}
if (isset($selected_stock_item))
{
- $sql .= " AND line.item_code=
'". $selected_stock_item ."' "
;
+ $sql .= " AND line.item_code=
".db_escape($selected_stock_item)
;
}
} //end not order number selected
}
} //end not order number selected
@@
-149,9
+155,10
@@
$cols = array(
_("Supplier") => array('ord'=>''),
_("Location"),
_("Supplier's Reference"),
_("Supplier") => array('ord'=>''),
_("Location"),
_("Supplier's Reference"),
- _("Order Date") => array('type'=>'date', 'ord'=>'desc'),
+ _("Order Date") => array('
name'=>'ord_date', '
type'=>'date', 'ord'=>'desc'),
_("Currency") => array('align'=>'center'),
_("Order Total") => 'amount',
_("Currency") => array('align'=>'center'),
_("Order Total") => 'amount',
+ array('insert'=>true, 'fun'=>'edit_link'),
array('insert'=>true, 'fun'=>'prt_link'),
);
array('insert'=>true, 'fun'=>'prt_link'),
);
@@
-162,11
+169,7
@@
if (get_post('StockLocation') != $all_items) {
$table =& new_db_pager('orders_tbl', $sql, $cols);
$table =& new_db_pager('orders_tbl', $sql, $cols);
-if (get_post('SearchOrders')) {
- $table->set_sql($sql);
- $table->set_columns($cols);
-}
-start_form();
+$table->width = "80%";
display_db_pager($table);
display_db_pager($table);