X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep305.php;h=8b71e0fb37fdee4812068dc8a139cfa09981a3be;hb=17b390efcf904072b02ec866b2a427490471a260;hp=3fdef19ed092cc2e6bb77db024158198afa3f707;hpb=90b3d069d96b99671af51726e2953352738abb75;p=fa-stable.git

diff --git a/reporting/rep305.php b/reporting/rep305.php
index 3fdef19e..8b71e0fb 100644
--- a/reporting/rep305.php
+++ b/reporting/rep305.php
@@ -63,11 +63,15 @@ function getSuppInvDetails($grn_item_id)
 	$sql = "SELECT
 			".TB_PREF."supp_invoice_items.supp_trans_no inv_no,
 			".TB_PREF."supp_invoice_items.quantity inv_qty,
-			".TB_PREF."supp_invoice_items.unit_price inv_price
-			FROM ".TB_PREF."grn_items, ".TB_PREF."supp_invoice_items
+			".TB_PREF."supp_trans.rate,
+			IF (".TB_PREF."supp_trans.tax_included = 1, ".TB_PREF."supp_invoice_items.unit_price - ".TB_PREF."supp_invoice_items.unit_tax, ".TB_PREF."supp_invoice_items.unit_price) inv_price
+			FROM ".TB_PREF."grn_items, ".TB_PREF."supp_trans, ".TB_PREF."supp_invoice_items
 			WHERE ".TB_PREF."grn_items.id = ".TB_PREF."supp_invoice_items.grn_item_id
 			AND ".TB_PREF."grn_items.po_detail_item = ".TB_PREF."supp_invoice_items.po_detail_item_id
 			AND ".TB_PREF."grn_items.item_code = ".TB_PREF."supp_invoice_items.stock_id
+			AND ".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."supp_invoice_items.supp_trans_type = 20
 			AND ".TB_PREF."supp_invoice_items.grn_item_id = ".$grn_item_id."
 			ORDER BY ".TB_PREF."supp_invoice_items.id asc";
 
@@ -83,13 +87,15 @@ function print_grn_valuation()
 	$from = $_POST['PARAM_0'];
 	$to = $_POST['PARAM_1'];
 	$comments = $_POST['PARAM_2'];
-	$destination = $_POST['PARAM_3'];
+	$orientation = $_POST['PARAM_3'];
+	$destination = $_POST['PARAM_4'];
 	if ($destination)
 		include_once($path_to_root . "/reporting/includes/excel_report.inc");
 	else
 		include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
-    $dec = user_price_dec();
+ 	$orientation = ($orientation ? 'L' : 'P');
+   	$dec = user_price_dec();
 
 	$cols = array(0, 75, 225, 260, 295, 330, 370, 410, 455, 515);
 	$headers = array(_('Stock ID'), _('Description'), _('PO No'), _('GRN')."#", _('Inv')."#", _('Qty'), _('Inv Price'), _('PO Price'), _('Total'));
@@ -99,7 +105,9 @@ function print_grn_valuation()
     $params =   array( 	0 => $comments,
     				    1 => array('text' => _('Period'),'from' => $from, 'to' => $to));
 
-    $rep = new FrontReport(_('GRN Valuation Report'), "GRNValuationReport", user_pagesize());
+    $rep = new FrontReport(_('GRN Valuation Report'), "GRNValuationReport", user_pagesize(), 9, $orientation);
+    if ($orientation == 'L')
+    	recalculate_cols($cols);
 
     $rep->Font();
     $rep->Info($params, $cols, $headers, $aligns);
@@ -124,10 +132,6 @@ function print_grn_valuation()
 			}
 			$stock_id = $trans['item_code'];
 		}
-		$curr = get_supplier_currency($trans['supplier_id']);
-		$rate = get_exchange_rate_from_home_currency($curr, sql2date($trans['delivery_date']));
-		$trans['unit_price'] *= $rate;
-		$trans['act_price'] *= $rate;
 
 		$rep->NewLine();
 		$rep->TextCol(0, 1, $trans['item_code']);
@@ -141,11 +145,11 @@ function print_grn_valuation()
 			$suppinv = getSuppInvDetails($trans['grn_item_id']);
 			while ($inv=db_fetch($suppinv))
 			{	
-				$inv['inv_price'] *= $rate;
+				$inv['inv_price'] *= $inv['rate'];
 				$rep->TextCol(4, 5, $inv['inv_no']);
 				$rep->AmountCol(5, 6, $inv['inv_qty'], $qdec);
 				$rep->AmountCol(6, 7, $inv['inv_price'], $dec);
-				$rep->AmountCol(7, 8, $trans['unit_price'], $dec);
+				$rep->AmountCol(7, 8, $trans['std_cost_unit'], $dec);
 				$amt = round2($inv['inv_qty'] * $inv['inv_price'], $dec);
 				$rep->AmountCol(8, 9, $amt, $dec);
 				$rep->NewLine();
@@ -154,9 +158,12 @@ function print_grn_valuation()
 				$grandtotal += $amt;
 			}
 		}
-	
+		
 		if ($trans['qty_recd'] - $trans['quantity_inv'] !=0 )
 		{
+			$curr = get_supplier_currency($trans['supplier_id']);
+			$rate = get_exchange_rate_from_home_currency($curr, sql2date($trans['delivery_date']));
+			$trans['unit_price'] *= $rate;
 			$rep->TextCol(4, 5, "--");
 			$rep->AmountCol(5, 6, $trans['qty_recd'] - $trans['quantity_inv'], $qdec);
 			$rep->AmountCol(7, 8, $trans['unit_price'], $dec);
@@ -187,4 +194,3 @@ function print_grn_valuation()
     $rep->End();
 }
 
-?>
\ No newline at end of file