X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=sales%2Finquiry%2Fsales_deliveries_view.php;h=4ea1a8241aa8d770f7ef9e9d3a8b8aa123399da2;hb=dcbdc8355d7a31eddf501e676a3e29a501d73a1b;hp=7362010feb63790ffe008f450410ae063160c7c3;hpb=348062667e6a96e9849bf25de0f2a426b4f0b9c6;p=fa-stable.git

diff --git a/sales/inquiry/sales_deliveries_view.php b/sales/inquiry/sales_deliveries_view.php
index 7362010f..4ea1a824 100644
--- a/sales/inquiry/sales_deliveries_view.php
+++ b/sales/inquiry/sales_deliveries_view.php
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 $page_security = 2;
 $path_to_root="../..";
 include($path_to_root . "/includes/db_pager.inc");
@@ -106,7 +115,7 @@ hidden('OutstandingOnly', $_POST['OutstandingOnly']);
 end_row();
 
 end_table();
-
+end_form();
 //---------------------------------------------------------------------------------------------
 
 if (isset($_POST['SelectStockFromList']) && ($_POST['SelectStockFromList'] != "") &&
@@ -129,7 +138,7 @@ function batch_checkbox($row)
 {
 	$name = "Sel_" .$row['trans_no'];
 	return $row['Done'] ? '' :
-		"<center><input type='checkbox' name='$name' value='1' ></center>"
+		"<input type='checkbox' name='$name' value='1' >"
 // add also trans_no => branch code for checking after 'Batch' submit
 	 ."<input name='Sel_[".$row['trans_no']."]' type='hidden' value='"
 	 .$row['branch_code']."'>\n";
@@ -139,19 +148,19 @@ function edit_link($row)
 {
 	return $row["Outstanding"]==0 ? '' :
 		pager_link(_('Edit'), "/sales/customer_delivery.php?ModifyDelivery="
-			.$row['trans_no']);
+			.$row['trans_no'], ICON_EDIT);
 }
 
 function prt_link($row)
 {
-	return print_document_link($row['trans_no'], _("Print"), true, 13);
+	return print_document_link($row['trans_no'], _("Print"), true, 13, ICON_PRINT);
 }
 
 function invoice_link($row)
 {
 	return $row["Outstanding"]==0 ? '' :
 		pager_link(_('Invoice'), "/sales/customer_invoice.php?DeliveryNumber=" 
-			.$row['trans_no']);
+			.$row['trans_no'], ICON_DOC);
 }
 
 function check_overdue($row)
@@ -217,22 +226,22 @@ else
 } //end no delivery number selected
 
 $cols = array(
-		_("Delivery #") => array('type'=>'spec', 'fun'=>'trans_view'), 
+		_("Delivery #") => array('fun'=>'trans_view'), 
 		_("Customer"), 
 		'branch_code' => 'skip',
-		_("Branch"), 
+		_("Branch") => array('ord'=>''), 
 		_("Contact"),
 		_("Reference"), 
 		_("Cust Ref"), 
-		_("Delivery Date") => 'date',
+		_("Delivery Date") => array('type'=>'date', 'ord'=>''),
 		_("Due By") => 'date', 
-		_("Delivery Total") => 'amount', 
-		_("Currency"),
-		submit('BatchInvoice','Batch Inv', false) 
-			=> array('type'=>'insert', 'fun'=>'batch_checkbox'),
-		array('type'=>'insert', 'fun'=>'edit_link'),
-		array('type'=>'insert', 'fun'=>'invoice_link'),
-		array('type'=>'insert', 'fun'=>'prt_link')
+		_("Delivery Total") => array('type'=>'amount', 'ord'=>''),
+		_("Currency") => array('align'=>'center'),
+		submit('BatchInvoice',_("Batch"), false, _("Batch Invoicing")) 
+			=> array('insert'=>true, 'fun'=>'batch_checkbox', 'align'=>'center'),
+		array('insert'=>true, 'fun'=>'edit_link'),
+		array('insert'=>true, 'fun'=>'invoice_link'),
+		array('insert'=>true, 'fun'=>'prt_link')
 );
 
 //-----------------------------------------------------------------------------------
@@ -243,25 +252,20 @@ if (isset($_SESSION['Batch']))
     unset($_SESSION['Batch']);
 }
 
-/*
-dla ka¿dego rz±dku
- $_SESSION['Batch'][] = array('trans'=>$myrow["trans_no"],
-    'cust'=>$myrow["name"],'branch'=>$myrow["br_name"] );
-*/
-
 $table =& new_db_pager('deliveries_tbl', $sql, $cols);
 $table->set_marker('check_overdue', _("Marked items are overdue."));
 
-
-if(get_post('SearchOrders')) 
-{
+if (get_post('SearchOrders')) {
 	$table->set_sql($sql);
-	$Ajax->activate('doc_tbl');
+	$table->set_columns($cols);
 }
+//$table->width = "92%";
+
+start_form();
+
+display_db_pager($table);
 
-	start_form();
-	display_db_pager($table);
-	end_form();
+end_form();
 end_page();
 
 ?>