X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Finquiry%2Fsales_orders_view.php;h=667c939e215ca5492b371b6eee5bc5b4627fe6fa;hb=ee88a73296f765b1b2a99f410f1d88a2b6afcc88;hp=9d42b4ad0b8ddba06ffbe74bea3063a02abce21d;hpb=0da4935c1fb5b588bfd7ead31f05069c9566eb8d;p=fa-stable.git diff --git a/sales/inquiry/sales_orders_view.php b/sales/inquiry/sales_orders_view.php index 9d42b4ad..667c939e 100644 --- a/sales/inquiry/sales_orders_view.php +++ b/sales/inquiry/sales_orders_view.php @@ -9,7 +9,6 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the License here . ***********************************************************************/ -$page_security = 'SA_STEMPLATE'; $path_to_root = "../.."; include($path_to_root . "/includes/db_pager.inc"); @@ -17,6 +16,15 @@ include($path_to_root . "/includes/session.inc"); include($path_to_root . "/sales/includes/sales_ui.inc"); include_once($path_to_root . "/reporting/includes/reporting.inc"); +$page_security = 'SA_SALESTRANSVIEW'; + +set_page_security( @$_POST['order_view_mode'], + array( 'OutstandingOnly' => 'SA_SALESDELIVERY', + 'InvoiceTemplates' => 'SA_SALESINVOICE'), + array( 'OutstandingOnly' => 'SA_SALESDELIVERY', + 'InvoiceTemplates' => 'SA_SALESINVOICE') +); + $js = ""; if ($use_popup_windows) $js .= get_js_open_window(900, 600); @@ -25,11 +33,12 @@ if ($use_date_picker) if (get_post('type')) $trans_type = $_POST['type']; -elseif (isset($_GET['type']) && $_GET['type'] == 32) - $trans_type = 32; +elseif (isset($_GET['type']) && $_GET['type'] == ST_SALESQUOTE) + $trans_type = ST_SALESQUOTE; else - $trans_type = 30; -if ($trans_type == 30) + $trans_type = ST_SALESORDER; + +if ($trans_type == ST_SALESORDER) { if (isset($_GET['OutstandingOnly']) && ($_GET['OutstandingOnly'] == true)) { @@ -73,7 +82,7 @@ else //--------------------------------------------------------------------------------------------- if (isset($_POST['SelectStockFromList']) && ($_POST['SelectStockFromList'] != "") && - ($_POST['SelectStockFromList'] != reserved_words::get_all())) + ($_POST['SelectStockFromList'] != ALL_TEXT)) { $selected_stock_item = $_POST['SelectStockFromList']; } @@ -86,9 +95,13 @@ else // function check_overdue($row) { - return ($row['type'] == 0 - && date1_greater_date2(Today(), sql2date($row['ord_date'])) - && ($row['TotDelivered'] < $row['TotQuantity'])); + global $trans_type; + if ($trans_type == ST_SALESQUOTE) + return (date1_greater_date2(Today(), sql2date($row['delivery_date']))); + else + return ($row['type'] == 0 + && date1_greater_date2(Today(), sql2date($row['ord_date'])) + && ($row['TotDelivered'] < $row['TotQuantity'])); } function view_link($dummy, $order_no) @@ -106,7 +119,7 @@ function prt_link($row) function edit_link($row) { global $trans_type; - $modify = ($trans_type == 30 ? "ModifyOrderNumber" : "ModifyQuotationNumber"); + $modify = ($trans_type == ST_SALESORDER ? "ModifyOrderNumber" : "ModifyQuotationNumber"); return pager_link( _("Edit"), "/sales/sales_order_entry.php?$modify=" . $row['order_no'], ICON_EDIT); } @@ -114,7 +127,7 @@ function edit_link($row) function dispatch_link($row) { global $trans_type; - if ($trans_type == 30) + if ($trans_type == ST_SALESORDER) return pager_link( _("Dispatch"), "/sales/customer_delivery.php?OrderNumber=" .$row['order_no'], ICON_DOC); else @@ -125,7 +138,7 @@ function dispatch_link($row) function invoice_link($row) { global $trans_type; - if ($trans_type == 30) + if ($trans_type == ST_SALESORDER) return pager_link( _("Invoice"), "/sales/sales_order_entry.php?NewInvoice=" .$row["order_no"], ICON_DOC); else @@ -147,7 +160,7 @@ function order_link($row) function tmpl_checkbox($row) { global $trans_type; - if ($trans_type == 32) + if ($trans_type == ST_SALESQUOTE) return ''; $name = "chgtpl" .$row['order_no']; $value = $row['type'] ? 1:0; @@ -219,6 +232,8 @@ locations_list_cells(_("Location:"), 'StockLocation', null, true); stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true); +if ($trans_type == ST_SALESQUOTE) + check_cells(_("Show All:"), 'show_all'); submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default'); hidden('order_view_mode', $_POST['order_view_mode']); @@ -227,7 +242,6 @@ hidden('type', $trans_type); end_row(); end_table(1); -end_form(); //--------------------------------------------------------------------------------------------- // Orders inquiry table // @@ -242,7 +256,7 @@ $sql = "SELECT ."sorder.ord_date, sorder.delivery_date, sorder.deliver_to, - Sum(line.unit_price*line.quantity*(1-line.discount_percent)) AS OrderValue, + Sum(line.unit_price*line.quantity*(1-line.discount_percent)+freight_cost) AS OrderValue, sorder.type, debtor.curr_code, Sum(line.qty_sent) AS TotDelivered, @@ -260,8 +274,9 @@ $sql = "SELECT if (isset($_POST['OrderNumber']) && $_POST['OrderNumber'] != "") { - // search orders with number like ... - $sql .= " AND sorder.order_no LIKE '%". $_POST['OrderNumber'] ."'" + // search orders with number like + $number_like = "%".$_POST['OrderNumber']; + $sql .= " AND sorder.order_no LIKE ".db_escape($number_like) ." GROUP BY sorder.order_no"; } else // ... or select inquiry constraints @@ -274,14 +289,16 @@ else // ... or select inquiry constraints $sql .= " AND sorder.ord_date >= '$date_after'" ." AND sorder.ord_date <= '$date_before'"; } + if ($trans_type == 32 && !check_value('show_all')) + $sql .= " AND sorder.delivery_date >= '".date2sql(Today())."'"; if ($selected_customer != -1) - $sql .= " AND sorder.debtor_no='" . $selected_customer . "'"; + $sql .= " AND sorder.debtor_no=".db_escape($selected_customer); if (isset($selected_stock_item)) - $sql .= " AND line.stk_code='". $selected_stock_item ."'"; + $sql .= " AND line.stk_code=".db_escape($selected_stock_item); - if (isset($_POST['StockLocation']) && $_POST['StockLocation'] != reserved_words::get_all()) - $sql .= " AND sorder.from_stk_loc = '". $_POST['StockLocation'] . "' "; + if (isset($_POST['StockLocation']) && $_POST['StockLocation'] != ALL_TEXT) + $sql .= " AND sorder.from_stk_loc = ".db_escape($_POST['StockLocation']); if ($_POST['order_view_mode']=='OutstandingOnly') $sql .= " AND line.qty_sent < line.quantity"; @@ -296,7 +313,7 @@ else // ... or select inquiry constraints sorder.deliver_to"; } -if ($trans_type == 30) +if ($trans_type == ST_SALESORDER) $cols = array( _("Order #") => array('fun'=>'view_link'), _("Ref"), @@ -325,25 +342,25 @@ else _("Currency") => array('align'=>'center') ); if ($_POST['order_view_mode'] == 'OutstandingOnly') { - //array_replace($cols, 3, 1, _("Cust Order Ref")); + //array_substitute($cols, 3, 1, _("Cust Order Ref")); array_append($cols, array(array('insert'=>true, 'fun'=>'dispatch_link'))); } elseif ($_POST['order_view_mode'] == 'InvoiceTemplates') { - array_replace($cols, 3, 1, _("Description")); + array_substitute($cols, 3, 1, _("Description")); array_append($cols, array( array('insert'=>true, 'fun'=>'invoice_link'))); } else if ($_POST['order_view_mode'] == 'DeliveryTemplates') { - array_replace($cols, 3, 1, _("Description")); + array_substitute($cols, 3, 1, _("Description")); array_append($cols, array( array('insert'=>true, 'fun'=>'delivery_link')) ); -} elseif ($trans_type == 32) { +} elseif ($trans_type == ST_SALESQUOTE) { array_append($cols,array( array('insert'=>true, 'fun'=>'edit_link'), array('insert'=>true, 'fun'=>'order_link'), array('insert'=>true, 'fun'=>'prt_link'))); -} elseif ($trans_type == 30) { +} elseif ($trans_type == ST_SALESORDER) { array_append($cols,array( _("Tmpl") => array('insert'=>true, 'fun'=>'tmpl_checkbox'), array('insert'=>true, 'fun'=>'edit_link'), @@ -354,12 +371,7 @@ if ($_POST['order_view_mode'] == 'OutstandingOnly') { $table =& new_db_pager('orders_tbl', $sql, $cols); $table->set_marker('check_overdue', _("Marked items are overdue.")); -if (get_post('SearchOrders')) { - $table->set_sql($sql); - $table->set_columns($cols); -} $table->width = "80%"; -start_form(); display_db_pager($table); submit_center('Update', _("Update"), true, '', null);