X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep301.php;h=a2801336bd5f30f7f4bcdff9fb612470d5e45563;hb=bf00f0e16df5974ecba17b59be8bc660bdf6b8a8;hp=1778773382a772059e56c81ca2403c1b4e8b5443;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git

diff --git a/reporting/rep301.php b/reporting/rep301.php
index 17787733..a2801336 100644
--- a/reporting/rep301.php
+++ b/reporting/rep301.php
@@ -36,8 +36,10 @@ function getTransactions($category, $location)
 		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
 		GROUP BY ".TB_PREF."stock_master.category_id,
-			".TB_PREF."stock_category.description,
-			UnitCost,
+			".TB_PREF."stock_category.description, ";
+		if ($location != 'all')
+			$sql .= TB_PREF."stock_moves.loc_code, ";
+		$sql .= "UnitCost,
 			".TB_PREF."stock_master.stock_id,
 			".TB_PREF."stock_master.description
 		HAVING SUM(".TB_PREF."stock_moves.qty) != 0";
@@ -63,7 +65,7 @@ function print_inventory_valuation_report()
     $location = $_POST['PARAM_1'];
     $detail = $_POST['PARAM_2'];
     $comments = $_POST['PARAM_3'];
-    
+
     $dec = user_price_dec();
 
 	if ($category == reserved_words::get_all_numeric())
@@ -97,7 +99,7 @@ function print_inventory_valuation_report()
     $rep->Header();
 
 	$res = getTransactions($category, $location);
-	$total = $grandtotal = 0.0; 
+	$total = $grandtotal = 0.0;
 	$catt = '';
 	while ($trans=db_fetch($res))
 	{
@@ -109,13 +111,13 @@ function print_inventory_valuation_report()
 				{
 					$rep->NewLine(2, 3);
 					$rep->TextCol(0, 4, _('Total'));
-				}	
+				}
 				$rep->Textcol(4, 5, number_format2($total, $dec));
 				if ($detail)
 				{
 					$rep->Line($rep->row - 2);
 					$rep->NewLine();
-				}	
+				}
 				$rep->NewLine();
 				$total = 0.0;
 			}
@@ -131,7 +133,7 @@ function print_inventory_valuation_report()
 			$rep->fontsize -= 2;
 			$rep->TextCol(0, 1, $trans['stock_id']);
 			$rep->TextCol(1, 2, $trans['description']);
-			$rep->TextCol(2, 3, number_format2($trans['QtyOnHand'], user_qty_dec()));
+			$rep->TextCol(2, 3, number_format2($trans['QtyOnHand'], get_qty_dec($trans['stock_id'])));
 			$rep->TextCol(3, 4, number_format2($trans['UnitCost'], $dec));
 			$rep->TextCol(4, 5, number_format2($trans['ItemTotal'], $dec));
 			$rep->fontsize += 2;
@@ -143,7 +145,7 @@ function print_inventory_valuation_report()
 	{
 		$rep->NewLine(2, 3);
 		$rep->TextCol(0, 4, _('Total'));
-	}	
+	}
 	$rep->Textcol(4, 5, number_format2($total, $dec));
 	if ($detail)
 	{