[Frontaccounting-cvs_updates] frontaccount/purchasing/inquiry po_search.php, 1.2.2.1, 1.2.2.2 po_se
Brought to you by:
frontaccounting,
itronics
Menu
▾
▴
[Frontaccounting-cvs_updates] frontaccount/purchasing/inquiry po_search.php, 1.2.2.1, 1.2.2.2 po_search_completed.php, 1.2, 1.2.2.1
|
From: FrontAccounting <fro...@us...> - 2008-03-28 15:23:51
|
Update of /cvsroot/frontaccounting/frontaccount/purchasing/inquiry In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv30757/purchasing/inquiry Modified Files: Tag: unstable po_search.php po_search_completed.php Log Message: Added print document options in inquiries. Index: po_search_completed.php =================================================================== RCS file: /cvsroot/frontaccounting/frontaccount/purchasing/inquiry/po_search_completed.php,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** po_search_completed.php 23 Apr 2007 21:56:55 -0000 1.2 --- po_search_completed.php 28 Mar 2008 15:23:53 -0000 1.2.2.1 *************** *** 6,9 **** --- 6,10 ---- include($path_to_root . "/purchasing/includes/purchasing_ui.inc"); + include_once($path_to_root . "/reporting/includes/reporting.inc"); $js = ""; if ($use_popup_windows) *************** *** 50,55 **** { $selected_stock_item = $_POST['SelectStockFromList']; ! } ! else { unset($selected_stock_item); --- 51,56 ---- { $selected_stock_item = $_POST['SelectStockFromList']; ! } ! else { unset($selected_stock_item); *************** *** 67,75 **** AND ".TB_PREF."locations.loc_code = ".TB_PREF."purch_orders.into_stock_location "; ! if (isset($order_number) && $order_number != "") { $sql .= "AND ".TB_PREF."purch_orders.reference LIKE '%". $order_number . "%'"; ! } ! else { --- 68,76 ---- AND ".TB_PREF."locations.loc_code = ".TB_PREF."purch_orders.into_stock_location "; ! if (isset($order_number) && $order_number != "") { $sql .= "AND ".TB_PREF."purch_orders.reference LIKE '%". $order_number . "%'"; ! } ! else { *************** *** 80,88 **** $sql .= " AND ".TB_PREF."purch_orders.ord_date <= '$date_before'"; ! if (isset($_POST['StockLocation']) && $_POST['StockLocation'] != reserved_words::get_all()) { $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 ."' "; --- 81,89 ---- $sql .= " AND ".TB_PREF."purch_orders.ord_date <= '$date_before'"; ! if (isset($_POST['StockLocation']) && $_POST['StockLocation'] != reserved_words::get_all()) { $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 ."' "; *************** *** 95,106 **** $result = db_query($sql,"No orders were returned"); start_table("$table_style colspan=7 width=80%"); if (isset($_POST['StockLocation']) && $_POST['StockLocation'] == reserved_words::get_all()) $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); --- 96,109 ---- $result = db_query($sql,"No orders were returned"); + print_hidden_script(18); + start_table("$table_style colspan=7 width=80%"); if (isset($_POST['StockLocation']) && $_POST['StockLocation'] == reserved_words::get_all()) $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); *************** *** 108,112 **** $j = 1; $k = 0; //row colour counter ! while ($myrow = db_fetch($result)) { --- 111,115 ---- $j = 1; $k = 0; //row colour counter ! while ($myrow = db_fetch($result)) { *************** *** 124,127 **** --- 127,131 ---- label_cell($myrow["curr_code"]); amount_cell($myrow["OrderValue"]); + label_cell(print_document_link($myrow['order_no'], _("Print"))); end_row(); Index: po_search.php =================================================================== RCS file: /cvsroot/frontaccounting/frontaccount/purchasing/inquiry/po_search.php,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** po_search.php 14 Mar 2008 20:17:46 -0000 1.2.2.1 --- po_search.php 28 Mar 2008 15:23:53 -0000 1.2.2.2 *************** *** 6,9 **** --- 6,10 ---- include($path_to_root . "/purchasing/includes/purchasing_ui.inc"); + include_once($path_to_root . "/reporting/includes/reporting.inc"); $js = ""; *************** *** 51,56 **** { $selected_stock_item = $_POST['SelectStockFromList']; ! } ! else { unset($selected_stock_item); --- 52,57 ---- { $selected_stock_item = $_POST['SelectStockFromList']; ! } ! else { unset($selected_stock_item); *************** *** 72,80 **** 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 { --- 73,81 ---- 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 { *************** *** 85,94 **** $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 ."' "; --- 86,95 ---- $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 ."' "; *************** *** 100,103 **** --- 101,106 ---- $result = db_query($sql,"No orders were returned"); + print_hidden_script(18); + /*show a table of the orders returned by the sql */ *************** *** 106,113 **** 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); --- 109,116 ---- 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); *************** *** 116,120 **** $k = 0; //row colour counter $overdue_items = false; ! while ($myrow = db_fetch($result)) { --- 119,123 ---- $k = 0; //row colour counter $overdue_items = false; ! while ($myrow = db_fetch($result)) { *************** *** 123,128 **** start_row("class='overduebg'"); $overdue_items = true; ! } ! else { alt_table_row_color($k); --- 126,131 ---- start_row("class='overduebg'"); $overdue_items = true; ! } ! else { alt_table_row_color($k); *************** *** 144,147 **** --- 147,151 ---- amount_cell($myrow["OrderValue"]); label_cell("<a href=$modify>" . _("Edit") . "</a>"); + label_cell(print_document_link($myrow['order_no'], _("Print"))); label_cell("<a href=$receive>" . _("Receive") . "</a>"); end_row(); |