X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=order_lines_view.php;h=f85e3b56a10ab39ad342019cba5541c6b25269bd;hb=68bcfcee0be5037bc0152d5daaeba3ce402ab471;hp=361de53c41431a2b3de1a56dacbdbc18bf00f813;hpb=785e111cb505d2ddc072de77455c79ef92a13e98;p=order_line_extra.git diff --git a/order_lines_view.php b/order_lines_view.php index 361de53..f85e3b5 100644 --- a/order_lines_view.php +++ b/order_lines_view.php @@ -25,6 +25,7 @@ $_SESSION['page_title'] = _($help_context = "Edit lines extra parameters"); update_extra_order_details(); + $js = ""; if ($use_popup_windows) $js .= get_js_open_window(900, 600); @@ -39,7 +40,19 @@ start_form(); start_table(TABLESTYLE_NOBORDER); start_row(); -customer_list_cells(_("Select a customer: "), 'customer_id', false, false, true); + +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 { + $customer_id = $_POST['customer_id']; +} +customer_list_cells(_("Select a customer: "), 'customer_id', $customer_id, true, true); @@ -54,14 +67,13 @@ end_table(1); //--------------------------------------------------------------------------------------------- // Orders inquiry table // -$customer_id = $_POST['customer_id']; if($customer_id) { $sql = get_order_details_extra($customer_id); $cols = array( 'detail_id' => 'skip' , _("Order #") => array('fun'=>'view_link', 'ord' => '') ,_("Item Code") => array('ord' => '') - ,_("Quantity") => array('type' => 'qty') + ,_("Quantity") => array('type' => 'qty', 'dec' => 0) ,_("Required Date") => array('fun' => 'input_date_details', 'ord' => '') ,_("Comment") => array('fun' => 'input_comment_details', 'ord' => '') ); @@ -69,13 +81,15 @@ if($customer_id) { else { $sql = get_order_summary(); $cols = array( -_("Customer") => array('ord' => ''), + 'customer id' => 'skip', +_("Customer") => array('ord' => '', 'fun' => 'customer_link'), _("Branch") => array('ord' => ''), -_("Delivery Date") => array('ord' => ''), -_("Quantity") => array('ord' => ''), +_("Delivery Date") => array('ord' => '', 'type' => 'date'), +_("Quantity") => array('ord' => '', 'type' => 'qty', 'dec' => 0), _("Amount") => array('ord' => '', 'type' => 'amount'), _("required date") => array('ord' => '', 'type' => 'date'), -_("comment") => array('ord' => ''), +_("Comments") => array('ord' => '', 'fun' => 'aggregate_comment'), +_("comment 2 ") => 'skip' ); } @@ -93,3 +107,25 @@ submit_center_last('Cancel', _("Cancel"), true, '', 'cancel', true); end_form(); end_page(); ?> +