X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep306.php;h=00cddadc1f96a000cd4c3fe61ff9abd0d87a2f55;hb=0ce53780d575e7bf4eefaa1b7edc0603131cc2b3;hp=51806bf6bf669517812898212d044233f00342ae;hpb=17b390efcf904072b02ec866b2a427490471a260;p=fa-stable.git

diff --git a/reporting/rep306.php b/reporting/rep306.php
index 51806bf6..00cddadc 100644
--- a/reporting/rep306.php
+++ b/reporting/rep306.php
@@ -33,64 +33,64 @@ function getTransactions($category, $location, $fromsupp, $item, $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."suppliers.supplier_id,
-			".TB_PREF."suppliers.supp_name AS supplier_name,
-			".TB_PREF."stock_moves.tran_date,
-			".TB_PREF."stock_moves.qty AS qty,
-			".TB_PREF."stock_moves.price*(1-".TB_PREF."stock_moves.discount_percent) AS price
-		FROM ".TB_PREF."stock_master,
-			".TB_PREF."stock_category,
-			".TB_PREF."suppliers,
-			".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."stock_moves.person_id=".TB_PREF."suppliers.supplier_id
-		AND ".TB_PREF."stock_moves.tran_date>='$from'
-		AND ".TB_PREF."stock_moves.tran_date<='$to'
-		AND (".TB_PREF."stock_moves.type=".ST_SUPPRECEIVE." OR ".TB_PREF."stock_moves.type=".ST_SUPPCREDIT.")
-		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,
+			supplier.supplier_id , IF(ISNULL(grn.rate), credit.rate, grn.rate) ex_rate,
+			supplier.supp_name AS supplier_name,
+			move.tran_date,
+			move.qty AS qty,
+			move.price
+		FROM ".TB_PREF."stock_moves move
+				LEFT JOIN ".TB_PREF."supp_trans credit ON credit.trans_no=move.trans_no AND credit.type=move.type
+				LEFT JOIN ".TB_PREF."grn_batch grn ON grn.id=move.trans_no AND 25=move.type
+				LEFT JOIN ".TB_PREF."suppliers supplier ON IFNULL(grn.supplier_id, credit.supplier_id)=supplier.supplier_id,
+			".TB_PREF."stock_master item,
+			".TB_PREF."stock_category category
+		WHERE item.stock_id=move.stock_id
+		AND item.category_id=category.category_id
+		AND move.tran_date>='$from'
+		AND move.tran_date<='$to'
+		AND (move.type=".ST_SUPPRECEIVE." OR move.type=".ST_SUPPCREDIT.")
+		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 ($fromsupp != '')
-			$sql .= " AND ".TB_PREF."suppliers.supplier_id = ".db_escape($fromsupp);
+			$sql .= " AND supplier.supplier_id = ".db_escape($fromsupp);
 		if ($item != '')
-			$sql .= " AND ".TB_PREF."stock_master.stock_id = ".db_escape($item);
-		$sql .= " ORDER BY ".TB_PREF."stock_master.category_id,
-			".TB_PREF."suppliers.supp_name, ".TB_PREF."stock_master.stock_id, ".TB_PREF."stock_moves.tran_date";
+			$sql .= " AND item.stock_id = ".db_escape($item);
+		$sql .= " ORDER BY item.category_id,
+			supplier.supp_name, item.stock_id, move.tran_date";
     return db_query($sql,"No transactions were returned");
 
 }
 
 function get_supp_inv_reference($supplier_id, $stock_id, $date)
 {
-	$sql = "SELECT ".TB_PREF."supp_trans.supp_reference
-		FROM ".TB_PREF."supp_trans,
-			".TB_PREF."supp_invoice_items,
-			".TB_PREF."grn_batch,
-			".TB_PREF."grn_items
-		WHERE ".TB_PREF."supp_trans.type=".TB_PREF."supp_invoice_items.supp_trans_type
-		AND ".TB_PREF."supp_trans.trans_no=".TB_PREF."supp_invoice_items.supp_trans_no
-		AND ".TB_PREF."grn_items.grn_batch_id=".TB_PREF."grn_batch.id
-		AND ".TB_PREF."grn_items.item_code=".TB_PREF."supp_invoice_items.stock_id
-		AND ".TB_PREF."supp_trans.supplier_id=".db_escape($supplier_id)."
-		AND ".TB_PREF."supp_invoice_items.stock_id=".db_escape($stock_id)."
-		AND ".TB_PREF."supp_trans.tran_date=".db_escape($date);
+	$sql = "SELECT trans.supp_reference
+		FROM ".TB_PREF."supp_trans trans,
+			".TB_PREF."supp_invoice_items line,
+			".TB_PREF."grn_batch batch,
+			".TB_PREF."grn_items item
+		WHERE trans.type=line.supp_trans_type
+		AND trans.trans_no=line.supp_trans_no
+		AND item.grn_batch_id=batch.id
+		AND item.item_code=line.stock_id
+		AND trans.supplier_id=".db_escape($supplier_id)."
+		AND line.stock_id=".db_escape($stock_id)."
+		AND trans.tran_date=".db_escape($date);
     $result = db_query($sql,"No transactions were returned");
     $row = db_fetch_row($result);
     if (isset($row[0]))
     	return $row[0];
     else
     	return '';
-}    
-    
-	
+}
+
 //----------------------------------------------------------------------------------------------------
 
 function print_inventory_purchase()
@@ -224,8 +224,7 @@ function print_inventory_purchase()
 		}
 		
 		$curr = get_supplier_currency($trans['supplier_id']);
-		$rate = get_exchange_rate_from_home_currency($curr, sql2date($trans['tran_date']));
-		$trans['price'] *= $rate;
+		$trans['price'] *= $trans['ex_rate'];
 		$rep->NewLine();
 		$trans['supp_reference'] = get_supp_inv_reference($trans['supplier_id'], $trans['stock_id'], $trans['tran_date']);
 		$rep->fontSize -= 2;
@@ -267,7 +266,7 @@ function print_inventory_purchase()
 			$rep->NewLine();
 			$rep->NewLine();
 			$total_supp = $total_qty = 0.0;
-			$supplier_name = $trans['supplier_name'];
+			$supplier_name = isset($trans['supplier_name']) ? $trans['supplier_name'] : "";
 		}	
 	}
 	if ($supplier_name != '')