X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Finquiry%2Fsales_deliveries_view.php;h=3b318997cf8e43323e29ad1f7c327497f45e944d;hb=54eb0e92cb17c72b8edf5ec88e6fe795e1ef91f0;hp=b4d9924b94c087276f35be06a2831d759139f7b1;hpb=1b9351ae81a67726e757eba55895a4f059c7f128;p=fa-stable.git

diff --git a/sales/inquiry/sales_deliveries_view.php b/sales/inquiry/sales_deliveries_view.php
index b4d9924b..3b318997 100644
--- 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);
@@ -140,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)
@@ -162,11 +162,11 @@ function check_overdue($row)
 			$row["Outstanding"]!=0;
 }
 //------------------------------------------------------------------------------------------------
-$sql = get_sql_for_sales_deliveries_view(get_post('DeliveryAfterDate'), get_post('DeliveryToDate'), get_post('customer_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'=>''), 
@@ -202,5 +202,3 @@ display_db_pager($table);
 end_form();
 end_page();
 
-?>
-