Right align numbers in inquiries and lists.

[fa-stable.git] / sales / inquiry / sales_deliveries_view.php

diff --git a/sales/inquiry/sales_deliveries_view.php b/sales/inquiry/sales_deliveries_view.php
index 2069703bdccad07e76d9f11bd4dda3f58966f26d..3cbb0f86446d525211d83eb08e48638d73aa56a7 100644 (file)
--- a/sales/inquiry/sales_deliveries_view.php
+++ b/sales/inquiry/sales_deliveries_view.php
@@ -18,9 +18,9 @@ include($path_to_root . "/sales/includes/sales_ui.inc");
 include_once($path_to_root . "/reporting/includes/reporting.inc");
 
 $js = "";
-if ($use_popup_windows)
+if ($SysPrefs->use_popup_windows)
        $js .= get_js_open_window(900, 600);
-if ($use_date_picker)
+if (user_use_date_picker())
        $js .= get_js_date_picker();
 
 if (isset($_GET['OutstandingOnly']) && ($_GET['OutstandingOnly'] == true))
@@ -36,14 +36,12 @@ else
 
 if (isset($_GET['selected_customer']))
 {
-       $selected_customer = $_GET['selected_customer'];
+       $_POST['customer_id'] = $_GET['selected_customer'];
 }
 elseif (isset($_POST['selected_customer']))
 {
-       $selected_customer = $_POST['selected_customer'];
+       $_POST['customer_id'] = $_POST['selected_customer'];
 }
-else
-       $selected_customer = -1;
 
 if (isset($_POST['BatchInvoice']))
 {
@@ -98,36 +96,32 @@ if (get_post('_DeliveryNumber_changed'))
 
 start_form(false, false, $_SERVER['PHP_SELF'] ."?OutstandingOnly=".$_POST['OutstandingOnly']);
 
-start_table("class='tablestyle_noborder'");
+start_table(TABLESTYLE_NOBORDER);
 start_row();
 ref_cells(_("#:"), 'DeliveryNumber', '',null, '', true);
-date_cells(_("from:"), 'DeliveryAfterDate', '', null, -30);
+date_cells(_("from:"), 'DeliveryAfterDate', '', null, -user_transaction_days());
 date_cells(_("to:"), 'DeliveryToDate', '', null, 1);
 
 locations_list_cells(_("Location:"), 'StockLocation', null, true);
+end_row();
+
+end_table();
+start_table(TABLESTYLE_NOBORDER);
+start_row();
 
 stock_items_list_cells(_("Item:"), 'SelectStockFromList', null, true);
 
+customer_list_cells(_("Select a customer: "), 'customer_id', null, true, true);
+
 submit_cells('SearchOrders', _("Search"),'',_('Select documents'), 'default');
 
 hidden('OutstandingOnly', $_POST['OutstandingOnly']);
 
 end_row();
 
-end_table();
+end_table(1);
 //---------------------------------------------------------------------------------------------
 
-if (isset($_POST['SelectStockFromList']) && ($_POST['SelectStockFromList'] != "") &&
-       ($_POST['SelectStockFromList'] != ALL_TEXT))
-{
-       $selected_stock_item = $_POST['SelectStockFromList'];
-}
-else
-{
-       unset($selected_stock_item);
-}
-
-//---------------------------------------------------------------------------------------------
 function trans_view($trans, $trans_no)
 {
        return get_customer_trans_view_str(ST_CUSTDELIVERY, $trans['trans_no']);
@@ -146,8 +140,7 @@ function batch_checkbox($row)
 function edit_link($row)
 {
        return $row["Outstanding"]==0 ? '' :
-               pager_link(_('Edit'), "/sales/customer_delivery.php?ModifyDelivery="
-                       .$row['trans_no'], ICON_EDIT);
+               trans_editor_link(ST_CUSTDELIVERY, $row['trans_no']);
 }
 
 function prt_link($row)
@@ -168,10 +161,11 @@ function check_overdue($row)
                        $row["Outstanding"]!=0;
 }
 //------------------------------------------------------------------------------------------------
-$sql = get_sql_for_sales_deliveries_view($selected_customer, $selected_stock_id);
+$sql = get_sql_for_sales_deliveries_view(get_post('DeliveryAfterDate'), get_post('DeliveryToDate'), get_post('customer_id'),   
+       get_post('SelectStockFromList'), get_post('StockLocation'), get_post('DeliveryNumber'), get_post('OutstandingOnly'));
 
 $cols = array(
-               _("Delivery #") => array('fun'=>'trans_view'), 
+               _("Delivery #") => array('fun'=>'trans_view', 'align'=>'right'), 
                _("Customer"), 
                'branch_code' => 'skip',
                _("Branch") => array('ord'=>''), 
@@ -207,5 +201,3 @@ display_db_pager($table);
 end_form();
 end_page();
 
-?>
-