Fixed small bug in sales orders inquiry, page title.
[fa-stable.git] / sales / inquiry / sales_orders_view.php
index ec0091232d96aba87076f866f672dfec6c59d88c..f59be9c028bb5de375939bc49421bd8c3b1dbdb1 100644 (file)
@@ -11,9 +11,9 @@
 ***********************************************************************/
 $path_to_root = "../..";
 
-include($path_to_root . "/includes/db_pager.inc");
-include($path_to_root . "/includes/session.inc");
-include($path_to_root . "/sales/includes/sales_ui.inc");
+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");
 
 $page_security = 'SA_SALESTRANSVIEW';
@@ -25,12 +25,6 @@ set_page_security( @$_POST['order_view_mode'],
                        'InvoiceTemplates' => 'SA_SALESINVOICE')
 );
 
-$js = "";
-if ($use_popup_windows)
-       $js .= get_js_open_window(900, 600);
-if ($use_date_picker)
-       $js .= get_js_date_picker();
-
 if (get_post('type'))
        $trans_type = $_POST['type'];
 elseif (isset($_GET['type']) && $_GET['type'] == ST_SALESQUOTE)
@@ -66,7 +60,16 @@ else
        $_POST['order_view_mode'] = "Quotations";
        $_SESSION['page_title'] = _($help_context = "Search All Sales Quotations");
 }
-page($_SESSION['page_title'], false, false, "", $js);
+
+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);
+}
 
 if (isset($_GET['selected_customer']))
 {
@@ -118,6 +121,8 @@ function prt_link($row)
 
 function edit_link($row) 
 {
+       if (@$_GET['popup'])\r
+               return '';\r
        global $trans_type;
        $modify = ($trans_type == ST_SALESORDER ? "ModifyOrderNumber" : "ModifyQuotationNumber");
   return pager_link( _("Edit"),
@@ -162,6 +167,8 @@ function tmpl_checkbox($row)
        global $trans_type;
        if ($trans_type == ST_SALESQUOTE)
                return '';
+       if (@$_GET['popup'])\r
+               return '';\r
        $name = "chgtpl" .$row['order_no'];
        $value = $row['type'] ? 1:0;
 
@@ -194,48 +201,50 @@ if (isset($_POST['Update']) && isset($_POST['last'])) {
                        change_tpl_flag($id);
 }
 
+$show_dates = !in_array($_POST['order_view_mode'], array('OutstandingOnly', 'InvoiceTemplates', 'DeliveryTemplates'));
 //---------------------------------------------------------------------------------------------
 //     Order range form
 //
-if (get_post('_OrderNumber_changed')) // enable/disable selection controls
+if (get_post('_OrderNumber_changed') || get_post('_OrderReference_changed')) // enable/disable selection controls
 {
-       $disable = get_post('OrderNumber') !== '';
+       $disable = get_post('OrderNumber') !== '' || get_post('OrderReference') !== '';
 
-       if ($_POST['order_view_mode']!='DeliveryTemplates' 
-               && $_POST['order_view_mode']!='InvoiceTemplates') {
+       if ($show_dates) {
                        $Ajax->addDisable(true, 'OrdersAfterDate', $disable);
                        $Ajax->addDisable(true, 'OrdersToDate', $disable);
        }
-       $Ajax->addDisable(true, 'StockLocation', $disable);
-       $Ajax->addDisable(true, '_SelectStockFromList_edit', $disable);
-       $Ajax->addDisable(true, 'SelectStockFromList', $disable);
-
-       if ($disable) {
-               $Ajax->addFocus(true, 'OrderNumber');
-       } else
-               $Ajax->addFocus(true, 'OrdersAfterDate');
 
        $Ajax->activate('orders_tbl');
 }
 
-start_form();
+if (!@$_GET['popup'])\r
+       start_form();
 
-start_table("class='tablestyle_noborder'");
+start_table(TABLESTYLE_NOBORDER);
 start_row();
 ref_cells(_("#:"), 'OrderNumber', '',null, '', true);
-if ($_POST['order_view_mode'] != 'DeliveryTemplates' && $_POST['order_view_mode'] != 'InvoiceTemplates')
+ref_cells(_("Ref"), 'OrderReference', '',null, '', true);
+if ($show_dates)
 {
        date_cells(_("from:"), 'OrdersAfterDate', '', null, -30);
        date_cells(_("to:"), 'OrdersToDate', '', null, 1);
 }
 locations_list_cells(_("Location:"), 'StockLocation', null, true);
 
-stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true);
+if($show_dates) {
+       end_row();
+       end_table();
 
+       start_table(TABLESTYLE_NOBORDER);
+       start_row();
+}
+stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true);
+if (!@$_GET['popup'])\r
+       customer_list_cells(_("Select a customer: "), 'customer_id', null, true);\r
 if ($trans_type == ST_SALESQUOTE)
        check_cells(_("Show All:"), 'show_all');
-submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default');
 
+submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default');
 hidden('order_view_mode', $_POST['order_view_mode']);
 hidden('type', $trans_type);
 
@@ -245,73 +254,8 @@ end_table(1);
 //---------------------------------------------------------------------------------------------
 //     Orders inquiry table
 //
-$sql = "SELECT 
-               sorder.order_no,
-               sorder.reference,
-               debtor.name,
-               branch.br_name,"
-               .($_POST['order_view_mode']=='InvoiceTemplates' 
-                       || $_POST['order_view_mode']=='DeliveryTemplates' ?
-                "sorder.comments, " : "sorder.customer_ref, ")
-               ."sorder.ord_date,
-               sorder.delivery_date,
-               sorder.deliver_to,
-               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,
-               Sum(line.quantity) AS TotQuantity
-       FROM ".TB_PREF."sales_orders as sorder, "
-               .TB_PREF."sales_order_details as line, "
-               .TB_PREF."debtors_master as debtor, "
-               .TB_PREF."cust_branch as branch
-               WHERE sorder.order_no = line.order_no
-               AND sorder.trans_type = line.trans_type
-               AND sorder.trans_type = $trans_type
-               AND sorder.debtor_no = debtor.debtor_no
-               AND sorder.branch_code = branch.branch_code
-               AND debtor.debtor_no = branch.debtor_no";
-
-if (isset($_POST['OrderNumber']) && $_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
-{
-       if ($_POST['order_view_mode']!='DeliveryTemplates' && $_POST['order_view_mode']!='InvoiceTemplates')
-       {
-               $date_after = date2sql($_POST['OrdersAfterDate']);
-               $date_before = date2sql($_POST['OrdersToDate']);
-
-               $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=".db_escape($selected_customer);
-
-       if (isset($selected_stock_item))
-               $sql .= " AND line.stk_code=".db_escape($selected_stock_item);
-
-       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";
-       elseif ($_POST['order_view_mode']=='InvoiceTemplates' || $_POST['order_view_mode']=='DeliveryTemplates')
-               $sql .= " AND sorder.type=1";
-
-       $sql .= " GROUP BY sorder.order_no,
-                               sorder.debtor_no,
-                               sorder.branch_code,
-                               sorder.customer_ref,
-                               sorder.ord_date,
-                               sorder.deliver_to";
-}
+$sql = get_sql_for_sales_orders_view($selected_customer, $trans_type, $_POST['OrderNumber'], $_POST['order_view_mode'],
+       @$selected_stock_item, @$_POST['OrdersAfterDate'], @$_POST['OrdersToDate'], @$_POST['OrderReference'], $_POST['StockLocation'], $_POST['customer_id']);\r
 
 if ($trans_type == ST_SALESORDER)
        $cols = array(
@@ -341,9 +285,11 @@ else
                'Type' => 'skip',
                _("Currency") => array('align'=>'center')
        );
-if ($_POST['order_view_mode'] == 'OutstandingOnly') {
-       //array_substitute($cols, 3, 1, _("Cust Order Ref"));
-       array_append($cols, array(array('insert'=>true, 'fun'=>'dispatch_link')));
+if ($_POST['order_view_mode'] == 'OutstandingOnly') {\r
+       //array_substitute($cols, 3, 1, _("Cust Order Ref"));\r
+       array_append($cols, array(\r
+               array('insert'=>true, 'fun'=>'dispatch_link'),\r
+               array('insert'=>true, 'fun'=>'edit_link')));\r
 
 } elseif ($_POST['order_view_mode'] == 'InvoiceTemplates') {
        array_substitute($cols, 3, 1, _("Description"));
@@ -376,6 +322,9 @@ $table->width = "80%";
 display_db_pager($table);
 submit_center('Update', _("Update"), true, '', null);
 
-end_form();
-end_page();
+if (!@$_GET['popup'])\r
+{
+       end_form();
+       end_page();
+}\r
 ?>
\ No newline at end of file