X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep204.php;h=6f63e3b62b07a34279070e63b62d48c277050628;hb=e8f8879003c1918b59e6da26be7f3927115ec21f;hp=a1bbf4329e784dcbe511d60e00b8ce98fc64caee;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git

diff --git a/reporting/rep204.php b/reporting/rep204.php
index a1bbf432..6f63e3b6 100644
--- a/reporting/rep204.php
+++ b/reporting/rep204.php
@@ -1,5 +1,14 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 $page_security = 2;
 // ----------------------------------------------------------------
 // $ Revision:	2.0 $
@@ -7,19 +16,19 @@ $page_security = 2;
 // date_:	2005-05-19
 // Title:	Outstanding GRNs Report
 // ----------------------------------------------------------------
-$path_to_root="../";
+$path_to_root="..";
 
-include_once($path_to_root . "includes/session.inc");
-include_once($path_to_root . "includes/date_functions.inc");
-include_once($path_to_root . "includes/data_checks.inc");
-include_once($path_to_root . "gl/includes/gl_db.inc");
+include_once($path_to_root . "/includes/session.inc");
+include_once($path_to_root . "/includes/date_functions.inc");
+include_once($path_to_root . "/includes/data_checks.inc");
+include_once($path_to_root . "/gl/includes/gl_db.inc");
 
 //----------------------------------------------------------------------------------------------------
 
 // trial_inquiry_controls();
 print_outstanding_GRN();
 
-function getTransactions($fromsupp, $tosupp)
+function getTransactions($fromsupp)
 {
 	$sql = "SELECT ".TB_PREF."grn_batch.id,
 			order_no,
@@ -39,10 +48,10 @@ function getTransactions($fromsupp, $tosupp)
 		WHERE ".TB_PREF."grn_batch.supplier_id=".TB_PREF."suppliers.supplier_id
 		AND ".TB_PREF."grn_batch.id = ".TB_PREF."grn_items.grn_batch_id
 		AND ".TB_PREF."grn_items.po_detail_item = ".TB_PREF."purch_order_details.po_detail_item
-		AND qty_recd-quantity_inv <>0
-		AND ".TB_PREF."grn_batch.supplier_id >='" . $fromsupp . "'
-		AND ".TB_PREF."grn_batch.supplier_id <='" . $tosupp . "'
-		ORDER BY ".TB_PREF."grn_batch.supplier_id, 
+		AND qty_recd-quantity_inv <>0 ";
+	if ($fromsupp != reserved_words::get_all_numeric())
+		$sql .= "AND ".TB_PREF."grn_batch.supplier_id ='" . $fromsupp . "' ";
+	$sql .= "ORDER BY ".TB_PREF."grn_batch.supplier_id,
 			".TB_PREF."grn_batch.id";
 
     return db_query($sql, "No transactions were returned");
@@ -54,16 +63,15 @@ function print_outstanding_GRN()
 {
     global $path_to_root;
 
-    include_once($path_to_root . "reporting/includes/pdf_report.inc");
+    include_once($path_to_root . "/reporting/includes/pdf_report.inc");
 
     $fromsupp = $_POST['PARAM_0'];
-    $tosupp = $_POST['PARAM_1'];
-    $comments = $_POST['PARAM_2'];
-    
-	if ($fromsupp == null)
-		$fromsupp = 0;
-	if ($tosupp == null)
-		$tosupp = 0;
+    $comments = $_POST['PARAM_1'];
+
+	if ($fromsupp == reserved_words::get_all_numeric())
+		$from = _('All');
+	else
+		$from = get_supplier_name($fromsupp);
     $dec = user_price_dec();
 
 	$cols = array(0, 40, 80, 190,	250, 320, 385, 450,	515);
@@ -74,8 +82,7 @@ function print_outstanding_GRN()
 	$aligns = array('left',	'left',	'left',	'right', 'right', 'right', 'right', 'right');
 
     $params =   array( 	0 => $comments,
-    				    1 => array('text' => _('Supplier'), 'from' => get_supplier_name($fromsupp),
-                            'to' => get_supplier_name($tosupp)));
+    				    1 => array('text' => _('Supplier'), 'from' => $from, 'to' => ''));
 
     $rep = new FrontReport(_('Outstanding GRNs Report'), "OutstandingGRN.pdf", user_pagesize());
 
@@ -86,10 +93,11 @@ function print_outstanding_GRN()
 	$Tot_Val=0;
 	$Supplier = '';
 	$SuppTot_Val=0;
-	$res = getTransactions($fromsupp, $tosupp);
-	
+	$res = getTransactions($fromsupp);
+
 	While ($GRNs = db_fetch($res))
-	{	
+	{
+		$dec2 = get_qty_dec($GRNs['item_code']);
 		if ($Supplier != $GRNs['supplier_id'])
 		{
 			if ($Supplier != '')
@@ -108,11 +116,11 @@ function print_outstanding_GRN()
 		$rep->TextCol(0, 1, $GRNs['id']);
 		$rep->TextCol(1, 2, $GRNs['order_no']);
 		$rep->TextCol(2, 3, $GRNs['item_code'] . '-' . $GRNs['description']);
-		$rep->TextCol(3, 4, number_format2($GRNs['qty_recd'], $dec));
-		$rep->TextCol(4, 5, number_format2($GRNs['quantity_inv'], $dec));
+		$rep->TextCol(3, 4, number_format2($GRNs['qty_recd'], $dec2));
+		$rep->TextCol(4, 5, number_format2($GRNs['quantity_inv'], $dec2));
 		$QtyOstg = $GRNs['qty_recd'] - $GRNs['quantity_inv'];
 		$Value = ($GRNs['qty_recd'] - $GRNs['quantity_inv']) * $GRNs['std_cost_unit'];
-		$rep->TextCol(5, 6, number_format2($QtyOstg, $dec));
+		$rep->TextCol(5, 6, number_format2($QtyOstg, $dec2));
 		$rep->TextCol(6, 7, number_format2($GRNs['std_cost_unit'], $dec));
 		$rep->TextCol(7, 8, number_format2($Value, $dec));
 		$Tot_Val += $Value;