X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=order_lines_view.php;h=362b3f0112aa1b2716d4128508de09f3918f3109;hb=514ad9dfb6f8ea147b9cb9ee9b89d2b0b485b607;hp=7dd1be949fe741d89c41ad4a99fe87209adf0912;hpb=34324e6c0dd76bb0af352cb6def4f0a49b68e0a3;p=order_line_extra.git diff --git a/order_lines_view.php b/order_lines_view.php index 7dd1be9..362b3f0 100644 --- a/order_lines_view.php +++ b/order_lines_view.php @@ -15,85 +15,92 @@ include_once($path_to_root . "/includes/db_pager.inc"); include_once($path_to_root . "/includes/session.inc"); include_once($path_to_root . "/sales/includes/sales_ui.inc"); include_once($path_to_root . "/reporting/includes/reporting.inc"); + +include_once("includes/order_lines.inc"); + $page_security = 'SA_ORDERLINEX_EDIT'; add_access_extensions(); - $_POST['order_view_mode'] = "Quotations"; - $_SESSION['page_title'] = _($help_context = "Edit lines extra parameters"); - -if (!@$_GET['popup']) -{ - $js = ""; - if ($use_popup_windows) - $js .= get_js_open_window(900, 600); - if ($use_date_picker) - $js .= get_js_date_picker(); - page($_SESSION['page_title'], false, false, "", $js); -} +$_SESSION['page_title'] = _($help_context = "Edit lines extra parameters"); -if (isset($_GET['selected_customer'])) -{ - $selected_customer = $_GET['selected_customer']; -} -elseif (isset($_POST['selected_customer'])) -{ - $selected_customer = $_POST['selected_customer']; -} -else - $selected_customer = -1; +// Process POST +update_extra_order_details(); +split_order_details(); + + +$js = ""; +if ($use_popup_windows) + $js .= get_js_open_window(900, 600); +if ($use_date_picker) + $js .= get_js_date_picker(); +page($_SESSION['page_title'], false, false, "", $js); //--------------------------------------------------------------------------------------------- -if (isset($_POST['SelectStockFromList']) && ($_POST['SelectStockFromList'] != "") && - ($_POST['SelectStockFromList'] != ALL_TEXT)) -{ - $selected_stock_item = $_POST['SelectStockFromList']; +start_form(); + +start_table(TABLESTYLE_NOBORDER); +start_row(); + + +if(!isset($_POST['customer_id'])) { + if(isset($_GET['customer_id'])) { + $customer_id = $_GET['customer_id']; + $_POST['customer_id'] = $customer_id; + } +else $customer_id = null; + } -else -{ - unset($selected_stock_item); +else { + $customer_id = $_POST['customer_id']; } +customer_list_cells(_("Select a customer: "), 'customer_id', $customer_id, true, true); -if (!@$_GET['popup']) - start_form(); -start_table(TABLESTYLE_NOBORDER); -start_row(); -ref_cells(_("#:"), 'OrderNumber', '',null, '', true); -ref_cells(_("Ref"), 'OrderReference', '',null, '', true); -locations_list_cells(_("Location:"), 'StockLocation', null, true); -stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true); -if (!@$_GET['popup']) - customer_list_cells(_("Select a customer: "), 'customer_id', null, true); -submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default'); -hidden('order_view_mode', $_POST['order_view_mode']); +//submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default'); end_row(); end_table(1); + //--------------------------------------------------------------------------------------------- // Orders inquiry table // -$trans_type = ST_SALESORDER; -$sql = get_sql_for_sales_orders_view($selected_customer, $trans_type, $_POST['OrderNumber'], 'OutstandingOnly', - @$selected_stock_item, @$_POST['OrdersAfterDate'], @$_POST['OrdersToDate'], @$_POST['OrderReference'], $_POST['StockLocation'], $_POST['customer_id']); - +if($customer_id) { + $sql = get_order_details_extra($customer_id, 'DEF'); $cols = array( - _("Order #") => array('fun'=>'view_link'), - _("Ref"), - _("Customer"), - _("Branch"), - _("Cust Order Ref"), - _("Order Date") => 'date', - _("Required By") =>array('type'=>'date', 'ord'=>''), - _("Delivery To"), - _("Order Total") => array('type'=>'amount', 'ord'=>''), - 'Type' => 'skip', - _("Currency") => array('align'=>'center') + 'detail_id' => 'skip' + , _("Order #") => array('fun'=>'view_link', 'ord' => '') + ,_("Item Code") => array('ord' => '', 'fun' => 'item_link') + ,_("Quantity") => array('type' => 'qty', 'dec' => 0) + ,_("Available") => array('fun' => 'available_quantity', 'dec' => 0, 'ord' => '') + ,_("Before") => 'skip' + ,_("Priority") => array('fun' => 'input_priority_date_details', 'ord' => '') + ,_("Hold Until") => array('fun' => 'input_hold_until_date_details', 'ord' => '') + ,_("Require By") => array('fun' => 'input_required_date_details', 'ord' => '') + ,_("Expiry Date") => array('fun' => 'input_expiry_date_details', 'ord' => '') + ,_("Comment") => array('fun' => 'input_comment_details', 'ord' => '') ); +} +else { + $sql = get_order_summary('DEF'); + $cols = array( + 'customer id' => 'skip', +_("Customer") => array('ord' => '', 'fun' => 'customer_link'), +_("Branch") => array('ord' => ''), +_("Delivery Date") => array('ord' => '', 'type' => 'date'), +_("Quantity") => array('ord' => '', 'type' => 'qty', 'dec' => 0), +_("Amount") => array('ord' => '', 'type' => 'amount'), +_("Avail. Q") => array('ord' => '', 'type' => 'qty', 'dec' => 0), +_("Avail. A") => array('ord' => '', 'type' => 'amount', 'dec' => 0), +_("required date") => array('ord' => '', 'type' => 'date'), +_("Comments") => array('ord' => '', 'fun' => 'aggregate_comment'), +_("comment 2 ") => 'skip' + ); +} $table =& new_db_pager('orders_tbl', $sql, $cols); @@ -101,11 +108,45 @@ $table =& new_db_pager('orders_tbl', $sql, $cols); $table->width = "80%"; display_db_pager($table); -submit_center('Update', _("Update"), true, '', null); -if (!@$_GET['popup']) -{ +function display_split_area() { +start_table(TABLESTYLE_NOBORDER); +date_cells('Start', 'name', 'title'); +date_cells('End', 'name', 'title'); +qty_cells('Max', 'huu', 6); +submit_cells('Split', 'Split'); +end_table(); + +} +display_split_area(); + + +br(1); +submit_center_first('Update', _("Update"), '', 'default', false); +submit_center_last('Cancel', _("Cancel"), '', 'cancel', false); + end_form(); end_page(); -} ?> +