X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep304.php;h=4bdedbcb0e90e1b63428b509fa96e856d2be5104;hb=33dfc21a26f08e9ac19048bbcf80cce2351a6cfe;hp=054a12d613b19c1d90c10d32bf6599151b8d1699;hpb=ecc75c8addbdcfa6683da0ce19661c3b115e3552;p=fa-stable.git

diff --git a/reporting/rep304.php b/reporting/rep304.php
index 054a12d6..4bdedbcb 100644
--- a/reporting/rep304.php
+++ b/reporting/rep304.php
@@ -33,39 +33,39 @@ function getTransactions($category, $location, $fromcust, $from, $to)
 {
 	$from = date2sql($from);
 	$to = date2sql($to);
-	$sql = "SELECT ".TB_PREF."stock_master.category_id,
-			".TB_PREF."stock_category.description AS cat_description,
-			".TB_PREF."stock_master.stock_id,
-			".TB_PREF."stock_master.description, ".TB_PREF."stock_master.inactive,
-			".TB_PREF."stock_moves.loc_code,
-			".TB_PREF."debtor_trans.debtor_no,
-			".TB_PREF."debtors_master.name AS debtor_name,
-			".TB_PREF."stock_moves.tran_date,
-			SUM(-".TB_PREF."stock_moves.qty) AS qty,
-			SUM(-".TB_PREF."stock_moves.qty*".TB_PREF."stock_moves.price*(1-".TB_PREF."stock_moves.discount_percent)) AS amt,
-			SUM(-IF(".TB_PREF."stock_moves.standard_cost <> 0, ".TB_PREF."stock_moves.qty * ".TB_PREF."stock_moves.standard_cost, ".TB_PREF."stock_moves.qty *(".TB_PREF."stock_master.material_cost + ".TB_PREF."stock_master.labour_cost + ".TB_PREF."stock_master.overhead_cost))) AS cost
-		FROM ".TB_PREF."stock_master,
-			".TB_PREF."stock_category,
-			".TB_PREF."debtor_trans,
-			".TB_PREF."debtors_master,
-			".TB_PREF."stock_moves
-		WHERE ".TB_PREF."stock_master.stock_id=".TB_PREF."stock_moves.stock_id
-		AND ".TB_PREF."stock_master.category_id=".TB_PREF."stock_category.category_id
-		AND ".TB_PREF."debtor_trans.debtor_no=".TB_PREF."debtors_master.debtor_no
-		AND ".TB_PREF."stock_moves.type=".TB_PREF."debtor_trans.type
-		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." OR ".TB_PREF."stock_moves.type=".ST_CUSTCREDIT.")
-		AND (".TB_PREF."stock_master.mb_flag='B' OR ".TB_PREF."stock_master.mb_flag='M')";
+	$sql = "SELECT item.category_id,
+			category.description AS cat_description,
+			item.stock_id,
+			item.description, item.inactive,
+			move.loc_code,
+			trans.debtor_no,
+			debtor.name AS debtor_name,
+			move.tran_date,
+			SUM(-move.qty) AS qty,
+			SUM(-move.qty*move.price) AS amt,
+			SUM(-IF(move.standard_cost <> 0, move.qty * move.standard_cost, move.qty *(item.material_cost + item.labour_cost + item.overhead_cost))) AS cost
+		FROM ".TB_PREF."stock_master item,
+			".TB_PREF."stock_category category,
+			".TB_PREF."debtor_trans trans,
+			".TB_PREF."debtors_master debtor,
+			".TB_PREF."stock_moves move
+		WHERE item.stock_id=move.stock_id
+		AND item.category_id=category.category_id
+		AND trans.debtor_no=debtor.debtor_no
+		AND move.type=trans.type
+		AND move.trans_no=trans.trans_no
+		AND move.tran_date>='$from'
+		AND move.tran_date<='$to'
+		AND (trans.type=".ST_CUSTDELIVERY." OR move.type=".ST_CUSTCREDIT.")
+		AND (item.mb_flag='B' OR item.mb_flag='M')";
 		if ($category != 0)
-			$sql .= " AND ".TB_PREF."stock_master.category_id = ".db_escape($category);
+			$sql .= " AND item.category_id = ".db_escape($category);
 		if ($location != '')
-			$sql .= " AND ".TB_PREF."stock_moves.loc_code = ".db_escape($location);
+			$sql .= " AND move.loc_code = ".db_escape($location);
 		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";
+			$sql .= " AND debtor.debtor_no = ".db_escape($fromcust);
+		$sql .= " GROUP BY item.stock_id, debtor.name ORDER BY item.category_id,
+			item.stock_id, debtor.name";
     return db_query($sql,"No transactions were returned");
 
 }
@@ -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)
@@ -121,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);
@@ -197,5 +201,3 @@ function print_inventory_sales()
 	$rep->NewLine();
     $rep->End();
 }
-
-?>
\ No newline at end of file