X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep304.php;h=63c6fc2eb5aa2872ef3021adeb16e2456d27c6c4;hb=a53ada1fa7eac32d429456e08f5ac7fb753ebc0d;hp=ac59e881f3f35c25ec0f5c55d8d24a2477a97506;hpb=558e613a8b90bc4092bdb9e2eb8a3d7cff58844a;p=fa-stable.git

diff --git a/reporting/rep304.php b/reporting/rep304.php
index ac59e881..63c6fc2e 100644
--- a/reporting/rep304.php
+++ b/reporting/rep304.php
@@ -56,13 +56,13 @@ function getTransactions($category, $location, $fromcust, $from, $to)
 		AND ".TB_PREF."stock_moves.trans_no=".TB_PREF."debtor_trans.trans_no
 		AND ".TB_PREF."stock_moves.tran_date>='$from'
 		AND ".TB_PREF."stock_moves.tran_date<='$to'
-		AND ((".TB_PREF."debtor_trans.type=".ST_CUSTDELIVERY." AND ".TB_PREF."debtor_trans.version=1) OR ".TB_PREF."stock_moves.type=".ST_CUSTCREDIT.")
+		AND (".TB_PREF."debtor_trans.type=".ST_CUSTDELIVERY." OR ".TB_PREF."stock_moves.type=".ST_CUSTCREDIT.")
 		AND (".TB_PREF."stock_master.mb_flag='B' OR ".TB_PREF."stock_master.mb_flag='M')";
 		if ($category != 0)
 			$sql .= " AND ".TB_PREF."stock_master.category_id = ".db_escape($category);
-		if ($location != 'all')
+		if ($location != '')
 			$sql .= " AND ".TB_PREF."stock_moves.loc_code = ".db_escape($location);
-		if ($fromcust != -1)
+		if ($fromcust != '')
 			$sql .= " AND ".TB_PREF."debtors_master.debtor_no = ".db_escape($fromcust);
 		$sql .= " GROUP BY ".TB_PREF."stock_master.stock_id, ".TB_PREF."debtors_master.name ORDER BY ".TB_PREF."stock_master.category_id,
 			".TB_PREF."stock_master.stock_id, ".TB_PREF."debtors_master.name";
@@ -82,12 +82,14 @@ function print_inventory_sales()
     $location = $_POST['PARAM_3'];
     $fromcust = $_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');
     $dec = user_price_dec();
 
 	if ($category == ALL_NUMERIC)
@@ -97,14 +99,12 @@ function print_inventory_sales()
 	else
 		$cat = get_category_name($category);
 
-	if ($location == ALL_TEXT)
-		$location = 'all';
-	if ($location == 'all')
+	if ($location == '')
 		$loc = _('All');
 	else
 		$loc = get_location_name($location);
 
-	if ($fromcust == ALL_NUMERIC)
+	if ($fromcust == '')
 		$fromc = _('All');
 	else
 		$fromc = get_customer_name($fromcust);
@@ -112,8 +112,8 @@ function print_inventory_sales()
 	$cols = array(0, 75, 175, 250, 300, 375, 450,	515);
 
 	$headers = array(_('Category'), _('Description'), _('Customer'), _('Qty'), _('Sales'), _('Cost'), _('Contribution'));
-	if ($fromcust != ALL_NUMERIC)
-		$headers[2] = '';	
+	if ($fromcust != '')
+		$headers[2] = '';
 
 	$aligns = array('left',	'left',	'left', 'right', 'right', 'right', 'right');
 
@@ -123,7 +123,9 @@ function print_inventory_sales()
     				    3 => array('text' => _('Location'), 'from' => $loc, 'to' => ''),
     				    4 => array('text' => _('Customer'), 'from' => $fromc, 'to' => ''));
 
-    $rep = new FrontReport(_('Inventory Sales Report'), "InventorySalesReport", user_pagesize());
+    $rep = new FrontReport(_('Inventory Sales Report'), "InventorySalesReport", user_pagesize(), 9, $orientation);
+   	if ($orientation == 'L')
+    	recalculate_cols($cols);
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
@@ -163,7 +165,7 @@ function print_inventory_sales()
 		$rep->NewLine();
 		$rep->fontSize -= 2;
 		$rep->TextCol(0, 1, $trans['stock_id']);
-		if ($fromcust == ALL_NUMERIC)
+		if ($fromcust == ALL_TEXT)
 		{
 			$rep->TextCol(1, 2, $trans['description'].($trans['inactive']==1 ? " ("._("Inactive").")" : ""), -1);
 			$rep->TextCol(2, 3, $trans['debtor_name']);
@@ -199,5 +201,3 @@ function print_inventory_sales()
 	$rep->NewLine();
     $rep->End();
 }
-
-?>
\ No newline at end of file