X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Frep302.php;h=417e44b7c99483495f12cccae2ffb0b2e92b8bf3;hb=ffc19f9a6c71002acacd8d72939b1c0e590c7178;hp=bfb515f1257ef238fdb0bb74b746eb3aa5fb148f;hpb=f44132511cc91b83f20f91af0625d4b112b4c26e;p=fa-stable.git

diff --git a/reporting/rep302.php b/reporting/rep302.php
index bfb515f1..417e44b7 100644
--- a/reporting/rep302.php
+++ b/reporting/rep302.php
@@ -36,7 +36,7 @@ function getTransactions($category, $location)
 			item.stock_id,
 			item.description, item.inactive,
 			IF(move.stock_id IS NULL, '', move.loc_code) AS loc_code,
-			SUM(IFNULL(move.stock_id, 0)) AS qty_on_hand
+			SUM(IF(move.stock_id IS NULL, 0, move.qty)) AS qty_on_hand
 		FROM (".TB_PREF."stock_master item,"
 			.TB_PREF."stock_category category)
 			LEFT JOIN ".TB_PREF."stock_moves move ON item.stock_id=move.stock_id
@@ -112,13 +112,11 @@ function print_inventory_planning()
 		$loc = get_location_name($location);
 
 	$cols = array(0, 50, 150, 180, 210, 240, 270, 300, 330, 390, 435, 480, 525);
-
-	$per0 = strftime('%b',mktime(0,0,0,date('m'),1,date('Y')));
-	$per1 = strftime('%b',mktime(0,0,0,date('m')-1,1,date('Y')));
-	$per2 = strftime('%b',mktime(0,0,0,date('m')-2,1,date('Y')));
-	$per3 = strftime('%b',mktime(0,0,0,date('m')-3,1,date('Y')));
-	$per4 = strftime('%b',mktime(0,0,0,date('m')-4,1,date('Y')));
-
+	$per0 = date('M',mktime(0,0,0,date('m'),1,date('Y')));
+	$per1 = date('M',mktime(0,0,0,date('m')-1,1,date('Y')));
+	$per2 = date('M',mktime(0,0,0,date('m')-2,1,date('Y')));
+	$per3 = date('M',mktime(0,0,0,date('m')-3,1,date('Y')));
+	$per4 = date('M',mktime(0,0,0,date('m')-4,1,date('Y')));
 	$headers = array(_('Category'), '', $per4, $per3, $per2, $per1, $per0, '3*M',
 		_('QOH'), _('Cust Ord'), _('Supp Ord'), _('Sugg Ord'));