X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep105.php;h=db32dffd3c85d793327101fea579039dddf13606;hb=b0c4c9777f9574e9c2805fddc2a12576d75d94ce;hp=dd535b9858b4b23cb993b9c05ffd636349b1a58b;hpb=ddadb47f2620ce6902ad4694ce6512568862ba05;p=fa-stable.git

diff --git a/reporting/rep105.php b/reporting/rep105.php
index dd535b98..db32dffd 100644
--- a/reporting/rep105.php
+++ b/reporting/rep105.php
@@ -57,11 +57,11 @@ function GetSalesOrders($from, $to, $category=0, $location=null, $backorder=0)
             WHERE ".TB_PREF."sales_orders.ord_date >='$fromdate'
                 AND ".TB_PREF."sales_orders.ord_date <='$todate'";
 	if ($category > 0)
-		$sql .= " AND ".TB_PREF."stock_master.category_id=$category";
+		$sql .= " AND ".TB_PREF."stock_master.category_id=".db_escape($category);
 	if ($location != null)
-		$sql .= " AND ".TB_PREF."sales_orders.from_stk_loc='$location'";
+		$sql .= " AND ".TB_PREF."sales_orders.from_stk_loc=".db_escape($location);
 	if ($backorder)
-		$sql .= "AND ".TB_PREF."sales_order_details.quantity - ".TB_PREF."sales_order_details.qty_sent > 0";
+		$sql .= " AND ".TB_PREF."sales_order_details.quantity - ".TB_PREF."sales_order_details.qty_sent > 0";
 	$sql .= " ORDER BY ".TB_PREF."sales_orders.order_no";
 
 	return db_query($sql, "Error getting order details");
@@ -79,11 +79,13 @@ function print_order_status_list()
 	$location = $_POST['PARAM_3'];
 	$backorder = $_POST['PARAM_4'];
 	$comments = $_POST['PARAM_5'];
-	$destination = $_POST['PARAM_6'];
+	$orientation = $_POST['PARAM_6'];
+	$destination = $_POST['PARAM_7'];
 	if ($destination)
 		include_once($path_to_root . "/reporting/includes/excel_report.inc");
 	else
 		include_once($path_to_root . "/reporting/includes/pdf_report.inc");
+	$orientation = ($orientation ? 'L' : 'P');
 
 	if ($category == ALL_NUMERIC)
 		$category = 0;
@@ -96,7 +98,7 @@ function print_order_status_list()
 	if ($location == null)
 		$loc = _('All');
 	else
-		$loc = $location;
+		$loc = get_location_name($location);
 	if ($backorder == 0)
 		$back = _('All Orders');
 	else
@@ -109,7 +111,7 @@ function print_order_status_list()
 
 	$aligns = array('left',	'left',	'right', 'right', 'right', 'right',	'right');
 
-	$headers = array(_('Code'),	_('Description'), _('Ordered'),	_('Invoiced'),
+	$headers = array(_('Code'),	_('Description'), _('Ordered'),	_('Delivered'),
 		_('Outstanding'), '');
 
     $params =   array( 	0 => $comments,
@@ -118,25 +120,22 @@ function print_order_status_list()
 	    				3 => array(  'text' => _('Location'), 'from' => $loc, 'to' => ''),
 	    				4 => array(  'text' => _('Selection'),'from' => $back,'to' => ''));
 
-	$cols2 = $cols;
 	$aligns2 = $aligns;
 
-	$rep = new FrontReport(_('Order Status Listing'), "OrderStatusListing", user_pagesize());
+	$rep = new FrontReport(_('Order Status Listing'), "OrderStatusListing", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+    	recalculate_cols($cols);
+	$cols2 = $cols;
 	$rep->Font();
 	$rep->Info($params, $cols, $headers, $aligns, $cols2, $headers2, $aligns2);
 
-	$rep->Header();
+	$rep->NewPage();
 	$orderno = 0;
 
 	$result = GetSalesOrders($from, $to, $category, $location, $backorder);
 
 	while ($myrow=db_fetch($result))
 	{
-		if ($rep->row < $rep->bottomMargin + (2 * $rep->lineHeight))
-		{
-			$orderno = 0;
-			$rep->Header();
-		}
 		$rep->NewLine(0, 2, false, $orderno);
 		if ($orderno != $myrow['order_no'])
 		{
@@ -168,14 +167,8 @@ function print_order_status_list()
 			$rep->Font();
 		}
 		$rep->NewLine();
-		if ($rep->row < $rep->bottomMargin + (2 * $rep->lineHeight))
-		{
-			$orderno = 0;
-			$rep->Header();
-		}
 	}
 	$rep->Line($rep->row);
 	$rep->End();
 }
 
-?>
\ No newline at end of file