+Journals

zivenarc · Oct 23, 2018 · 81773a2 · 81773a2
1 parent 6396b1e
commit 81773a2
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 3 deletions.
diff --git a/rep_admin_costs.php b/rep_admin_costs.php
@@ -27,6 +27,32 @@
 <div id='report_content'>
 <?php
 $oReport->quarterly('item_bu',false);	
+?>
+</div>
+<div>
+<h4>Documents</h4>
+<?php 
+	$sql = "SELECT *,  edit_date as timestamp 
+		FROM vw_journal 			
+		LEFT JOIN stbl_user ON usrID=vw_journal.edit_by						
+		WHERE vw_journal.scenario='{$budget_scenario}' 
+			AND guid IN (SELECT source 
+						FROM reg_master 
+						WHERE scenario='{$budget_scenario}' 
+							AND item IN('".implode("','",$arrItems)."') 
+							AND company='{$company}')
+		GROUP BY vw_journal.guid
+		ORDER BY vw_journal.prefix ASC";	
+
+		 //echo '<pre>',$sql,'</pre>';
+
+		$rs =$oSQL->q($sql);
+		while ($rw=$oSQL->f($rs)){
+			$data[] = $rw;
+		}
+
+		Reports::getJournalEntries($data);
+
 ?>
 </div>
 <?php

diff --git a/rep_it_costs.php b/rep_it_costs.php
@@ -37,13 +37,13 @@
 		WHERE vw_journal.scenario='{$budget_scenario}' 
 			AND guid IN (SELECT source 
 						FROM reg_master 
-						WHERE scenario='{{$budget_scenario}}' 
+						WHERE scenario='{$budget_scenario}' 
 							AND item IN('".implode("','",$arrItems)."') 
 							AND company='{$company}')
 		GROUP BY vw_journal.guid
-		ORDER BY vw_journal.edit_date ASC";	
+		ORDER BY vw_journal.prefix ASC";	
 
-		// echo '<pre>',$sql,'</pre>';
+		 //echo '<pre>',$sql,'</pre>';
 
 		$rs =$oSQL->q($sql);
 		while ($rw=$oSQL->f($rs)){