Bug in gl/includes/db/gl_journal.inc. Fixed by @barbarian.

[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 4da4d98b5ca06798cf0e60cd5a7029942171141d..3b318997cf8e43323e29ad1f7c327497f45e944d 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,36 +36,35 @@ 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']))
 {
        // checking batch integrity
     $del_count = 0;
-    foreach($_POST['Sel_'] as $delivery => $branch) {
-               $checkbox = 'Sel_'.$delivery;
-               if (check_value($checkbox))     {
-               if (!$del_count) {
-                               $del_branch = $branch;
-               }
-               else {
-                               if ($del_branch != $branch)     {
-                               $del_count=0;
-                               break;
+    if (isset($_POST['Sel_'])) {
+               foreach($_POST['Sel_'] as $delivery => $branch) {
+                       $checkbox = 'Sel_'.$delivery;
+                       if (check_value($checkbox))     {
+                               if (!$del_count) {
+                                       $del_branch = $branch;
                                }
-               }
-               $selected[] = $delivery;
-               $del_count++;
-               }
-    }
-
+                               else {
+                                       if ($del_branch != $branch)     {
+                                               $del_count=0;
+                                               break;
+                                       }
+                               }
+                               $selected[] = $delivery;
+                               $del_count++;
+                       }
+               }
+       }
     if (!$del_count) {
                display_error(_('For batch invoicing you should
                    select at least one delivery. All items must be dispatched to
@@ -101,7 +100,7 @@ start_form(false, false, $_SERVER['PHP_SELF'] ."?OutstandingOnly=".$_POST['Outst
 start_table(TABLESTYLE_NOBORDER);
 start_row();
 ref_cells(_("#:"), 'DeliveryNumber', '',null, '', true);
-date_cells(_("from:"), 'DeliveryAfterDate', '', null, -$_SESSION["wa_current_user"]->prefs->transaction_days());
+date_cells(_("from:"), 'DeliveryAfterDate', '', null, -user_transaction_days());
 date_cells(_("to:"), 'DeliveryToDate', '', null, 1);
 
 locations_list_cells(_("Location:"), 'StockLocation', null, true);
@@ -113,6 +112,8 @@ 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']);
@@ -122,17 +123,6 @@ end_row();
 end_table(1);
 //---------------------------------------------------------------------------------------------
 
-if (isset($_POST['SelectStockFromList']) && ($_POST['SelectStockFromList'] != "") &&
-       ($_POST['SelectStockFromList'] != ALL_TEXT))
-{
-       $selected_stock_item = $_POST['SelectStockFromList'];
-}
-else
-{
-       $selected_stock_item = null;
-}
-
-//---------------------------------------------------------------------------------------------
 function trans_view($trans, $trans_no)
 {
        return get_customer_trans_view_str(ST_CUSTDELIVERY, $trans['trans_no']);
@@ -151,8 +141,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)
@@ -173,10 +162,11 @@ function check_overdue($row)
                        $row["Outstanding"]!=0;
 }
 //------------------------------------------------------------------------------------------------
-$sql = get_sql_for_sales_deliveries_view($selected_customer, $selected_stock_item);
+$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'=>''), 
@@ -212,5 +202,3 @@ display_db_pager($table);
 end_form();
 end_page();
 
-?>
-