Latest updates from IceHrmPro

core/src/Reports/Admin/Api/PDFReportBuilder.php

@@ -36,8 +36,7 @@ class PDFReportBuilder extends ReportBuilder
             $path = APP_BASE_PATH."admin/reports/customTemplates/";
         }
         $loader = new \Twig_Loader_Filesystem($path);
-        $twigOptions = array();
-        //false
+
         if (defined('CACHE_THEME') && CACHE_THEME) {
             $twigOptions = array(
             );
@@ -81,6 +80,7 @@ class PDFReportBuilder extends ReportBuilder
                 $fileFullName = $fileFullNamePdf;
             }
         } catch (\Exception $exp) {
+            LogManager::getInstance()->notifyException($exp);
         }
         return array($fileFirstPart, $fileName, $fileFullName);
     }

core/src/Reports/Admin/Reports/ExpenseReport.php

@@ -18,7 +18,8 @@ transaction_no as 'Transaction Ref',
 payee as 'Payee',
 (SELECT name from ExpensesCategories where id = category) as 'Category',
 notes as 'Notes',
-concat(`amount`,' ',`currency`) as 'Amount',
+amount as 'Amount',
+(SELECT code from CurrencyTypes where id = currency) as 'Currency',
 status as 'Status',
 created as 'Created',
 updated as 'Updated'

core/src/Reports/User/Reports/ClientProjectTimeReport.php

@@ -9,7 +9,7 @@ use Metadata\Common\Model\Country;
 use Reports\Admin\Api\PDFReportBuilder;
 use Reports\Admin\Api\PDFReportBuilderInterface;
 use Employees\Common\Model\Employee;
-use Projects\Common\Model\Client;
+use Clients\Common\Model\Client;
 use Projects\Common\Model\Project;
 use TimeSheets\Common\Model\EmployeeTimeEntry;
 use Utils\CalendarTools;