[0005509] Installer: Fixed errors handling, fixed errors on db passwords containg...

[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 b9ed9b6e6b06cc4a015307fb53706ca4b71b83d6..3b318997cf8e43323e29ad1f7c327497f45e944d 100644 (file)
--- a/sales/inquiry/sales_deliveries_view.php
+++ b/sales/inquiry/sales_deliveries_view.php
@@ -18,7 +18,7 @@ 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 (user_use_date_picker())
        $js .= get_js_date_picker();
@@ -47,23 +47,24 @@ 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
@@ -99,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);
@@ -165,7 +166,7 @@ $sql = get_sql_for_sales_deliveries_view(get_post('DeliveryAfterDate'), get_post
        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'=>''),