diff --git a/resources/views/reports/chart_builder.blade.php b/resources/views/reports/chart_builder.blade.php
index 438d06314c5c..1cc1450d0826 100644
--- a/resources/views/reports/chart_builder.blade.php
+++ b/resources/views/reports/chart_builder.blade.php
@@ -1,7 +1,7 @@
 @extends('header')
 
 @section('head')
-    @parent
+	@parent
 
     <script src="{{ asset('js/daterangepicker.min.js') }}" type="text/javascript"></script>
     <link href="{{ asset('css/daterangepicker.css') }}" rel="stylesheet" type="text/css"/>
@@ -9,42 +9,42 @@
     <link href="{{ asset('css/tablesorter.css') }}" rel="stylesheet" type="text/css"/>
     <script src="{{ asset('js/tablesorter.min.js') }}" type="text/javascript"></script>
 
-    <style type="text/css">
-        table.tablesorter th {
-            color: white;
-            background-color: #777 !important;
-        }
+	<style type="text/css">
+		table.tablesorter th {
+			color: white;
+			background-color: #777 !important;
+		}
 
-    </style>
+	</style>
 
 @stop
 
 @section('content')
 
-    @if (!Utils::isPro())
-        <div class="alert alert-warning" style="font-size:larger;">
-            <center>
-                {!! trans('texts.pro_plan_reports', ['link'=>'<a href="javascript:showUpgradeModal()">' . trans('texts.pro_plan_remove_logo_link') . '</a>']) !!}
-            </center>
-        </div>
-    @endif
+	@if (!Utils::isPro())
+	    <div class="alert alert-warning" style="font-size:larger;">
+	    <center>
+	        {!! trans('texts.pro_plan_reports', ['link'=>'<a href="javascript:showUpgradeModal()">' . trans('texts.pro_plan_remove_logo_link') . '</a>']) !!}
+	    </center>
+	    </div>
+	@endif
 
     <script type="text/javascript">
 
-        var chartStartDate = moment("{{ $startDate }}");
-        var chartEndDate = moment("{{ $endDate }}");
-        var dateRanges = {!! $account->present()->dateRangeOptions !!};
+		var chartStartDate = moment("{{ $startDate }}");
+		var chartEndDate = moment("{{ $endDate }}");
+		var dateRanges = {!! $account->present()->dateRangeOptions !!};
 
         $(function() {
 
-            if (isStorageSupported()) {
-                var lastRange = localStorage.getItem('last:report_range');
-                lastRange = dateRanges[lastRange];
-                if (lastRange) {
-                    chartStartDate = lastRange[0];
-                    chartEndDate = lastRange[1];
-                }
-            }
+			if (isStorageSupported()) {
+				var lastRange = localStorage.getItem('last:report_range');
+				lastRange = dateRanges[lastRange];
+				if (lastRange) {
+					chartStartDate = lastRange[0];
+					chartEndDate = lastRange[1];
+				}
+			}
 
             // Initialize date range selector
             function cb(start, end, label) {
@@ -52,20 +52,20 @@
                 $('#start_date').val(start.format('YYYY-MM-DD'));
                 $('#end_date').val(end.format('YYYY-MM-DD'));
 
-                if (isStorageSupported() && label && label != "{{ trans('texts.custom_range') }}") {
-                    localStorage.setItem('last:report_range', label);
-                }
+				if (isStorageSupported() && label && label != "{{ trans('texts.custom_range') }}") {
+					localStorage.setItem('last:report_range', label);
+				}
             }
 
             $('#reportrange').daterangepicker({
                 locale: {
-                    format: "{{ $account->getMomentDateFormat() }}",
-                    customRangeLabel: "{{ trans('texts.custom_range') }}",
+					format: "{{ $account->getMomentDateFormat() }}",
+					customRangeLabel: "{{ trans('texts.custom_range') }}",
                 },
                 startDate: chartStartDate,
                 endDate: chartEndDate,
                 linkedCalendars: false,
-                ranges: dateRanges,
+				ranges: dateRanges,
             }, cb);
 
             cb(chartStartDate, chartEndDate);
@@ -78,138 +78,138 @@
     {!! Former::open()->addClass('report-form')->rules(['start_date' => 'required', 'end_date' => 'required']) !!}
 
     <div style="display:none">
-        {!! Former::text('action') !!}
+    {!! Former::text('action') !!}
     </div>
 
     {!! Former::populateField('start_date', $startDate) !!}
     {!! Former::populateField('end_date', $endDate) !!}
 
-    @if ( ! request()->report_type)
-        {!! Former::populateField('group_when_sorted', 1) !!}
-        {!! Former::populateField('group_dates_by', 'monthyear') !!}
-    @endif
+	@if ( ! request()->report_type)
+		{!! Former::populateField('group_when_sorted', 1) !!}
+		{!! Former::populateField('group_dates_by', 'monthyear') !!}
+	@endif
 
-    <div class="row">
-        <div class="col-lg-12">
+	<div class="row">
+		<div class="col-lg-12">
             <div class="panel panel-default">
-                <div class="panel-heading">
-                    <h3 class="panel-title">{!! trans('texts.report_settings') !!}</h3>
-                </div>
-                <div class="panel-body">
-                    <div class="row">
-                        <div class="col-md-6">
+            <div class="panel-heading">
+                <h3 class="panel-title">{!! trans('texts.report_settings') !!}</h3>
+            </div>
+            <div class="panel-body">
+                <div class="row">
+                    <div class="col-md-6">
 
-                            {!! Former::select('report_type')->options($reportTypes, $reportType)->label(trans('texts.type')) !!}
+						{!! Former::select('report_type')->options($reportTypes, $reportType)->label(trans('texts.type')) !!}
 
-                            <div class="form-group">
-                                <label for="reportrange" class="control-label col-lg-4 col-sm-4">
-                                    {{ trans('texts.date_range') }}
-                                </label>
-                                <div class="col-lg-8 col-sm-8">
-                                    <div id="reportrange" style="background: #f9f9f9; cursor: pointer; padding: 9px 14px; border: 1px solid #dfe0e1; margin-top: 0px;">
-                                        <i class="glyphicon glyphicon-calendar fa fa-calendar"></i>&nbsp;
-                                        <span></span> <b class="caret"></b>
-                                    </div>
+						<div class="form-group">
+                            <label for="reportrange" class="control-label col-lg-4 col-sm-4">
+                                {{ trans('texts.date_range') }}
+                            </label>
+                            <div class="col-lg-8 col-sm-8">
+                                <div id="reportrange" style="background: #f9f9f9; cursor: pointer; padding: 9px 14px; border: 1px solid #dfe0e1; margin-top: 0px;">
+                                    <i class="glyphicon glyphicon-calendar fa fa-calendar"></i>&nbsp;
+                                    <span></span> <b class="caret"></b>
+                                </div>
 
-                                    <div style="display:none">
-                                        {!! Former::text('start_date') !!}
-                                        {!! Former::text('end_date') !!}
-                                    </div>
+                                <div style="display:none">
+                                    {!! Former::text('start_date') !!}
+                                    {!! Former::text('end_date') !!}
                                 </div>
                             </div>
-
-                            <div id="statusField" style="display:{{ in_array($reportType, [ENTITY_INVOICE, ENTITY_PRODUCT]) ? 'block' : 'none' }}">
-                                {!! Former::select('invoice_status')->label('status')
-                                        ->addOption(trans('texts.all'), 'all')
-                                        ->addOption(trans('texts.draft'), 'draft')
-                                        ->addOption(trans('texts.sent'), 'sent')
-                                        ->addOption(trans('texts.unpaid'), 'unpaid')
-                                        ->addOption(trans('texts.paid'), 'paid') !!}
-                            </div>
-
-                            <div id="dateField" style="display:{{ $reportType == ENTITY_TAX_RATE ? 'block' : 'none' }}">
-                                {!! Former::select('date_field')->label(trans('texts.filter'))
-                                        ->addOption(trans('texts.invoice_date'), FILTER_INVOICE_DATE)
-                                        ->addOption(trans('texts.payment_date'), FILTER_PAYMENT_DATE) !!}
-                            </div>
-
                         </div>
-                        <div class="col-md-6">
 
-                            {!! Former::checkbox('group_when_sorted')->text('enable') !!}
-                            {!! Former::select('group_dates_by')
-                                        ->addOption(trans('texts.day'), 'day')
-                                        ->addOption(trans('texts.month'), 'monthyear')
-                                        ->addOption(trans('texts.year'), 'year') !!}
+						<div id="statusField" style="display:{{ in_array($reportType, [ENTITY_INVOICE, ENTITY_PRODUCT]) ? 'block' : 'none' }}">
+							{!! Former::select('invoice_status')->label('status')
+									->addOption(trans('texts.all'), 'all')
+									->addOption(trans('texts.draft'), 'draft')
+									->addOption(trans('texts.sent'), 'sent')
+									->addOption(trans('texts.unpaid'), 'unpaid')
+									->addOption(trans('texts.paid'), 'paid') !!}
+						</div>
 
+						<div id="dateField" style="display:{{ $reportType == ENTITY_TAX_RATE ? 'block' : 'none' }}">
+                            {!! Former::select('date_field')->label(trans('texts.filter'))
+                                    ->addOption(trans('texts.invoice_date'), FILTER_INVOICE_DATE)
+                                    ->addOption(trans('texts.payment_date'), FILTER_PAYMENT_DATE) !!}
                         </div>
+
                     </div>
-                </div>
-            </div>
+                    <div class="col-md-6">
 
-            @if (!Auth::user()->hasFeature(FEATURE_REPORTS))
-                <script>
-                    $(function() {
-                        $('form.report-form').find('input, button').prop('disabled', true);
-                    });
-                </script>
-            @endif
+						{!! Former::checkbox('group_when_sorted')->text('enable') !!}
+						{!! Former::select('group_dates_by')
+									->addOption(trans('texts.day'), 'day')
+									->addOption(trans('texts.month'), 'monthyear')
+									->addOption(trans('texts.year'), 'year') !!}
+
+        		  </div>
+        </div>
+	</div>
+    </div>
+
+	@if (!Auth::user()->hasFeature(FEATURE_REPORTS))
+	<script>
+		$(function() {
+			$('form.report-form').find('input, button').prop('disabled', true);
+		});
+	</script>
+	@endif
 
 
-            <center>
-                {!! Former::select('format')
-                     ->label(trans('texts.format_export'))
-                     ->options(['csv' => 'CSV', 'pdf' => 'PDF', 'xlsx' => 'Excel']) !!}
-                {!! Button::primary(trans('texts.export'))
-                        ->withAttributes(array('onclick' => 'onExportClick()'))
-                        ->appendIcon(Icon::create('export'))
-                        ->large() !!}
-                {!! Button::success(trans('texts.run'))
-                        ->withAttributes(array('id' => 'submitButton'))
-                        ->submit()
-                        ->appendIcon(Icon::create('play'))
-                        ->large() !!}
-            </center><br/>
+	<center>
+		{!! Former::select('format')
+				 ->label(trans('texts.format_export'))
+				 ->options(['csv' => 'CSV', 'pdf' => 'PDF', 'xlsx' => 'Excel']) !!}
+		{!! Button::primary(trans('texts.export'))
+				->withAttributes(array('onclick' => 'onExportClick()'))
+				->appendIcon(Icon::create('export'))
+				->large() !!}
+		{!! Button::success(trans('texts.run'))
+				->withAttributes(array('id' => 'submitButton'))
+				->submit()
+				->appendIcon(Icon::create('play'))
+				->large() !!}
+	</center><br/>
 
 
-            {!! Former::close() !!}
+	{!! Former::close() !!}
 
 
-            @if (request()->report_type)
-                <div class="panel panel-default">
-                    <div class="panel-body">
+	@if (request()->report_type)
+        <div class="panel panel-default">
+        <div class="panel-body">
 
-                        @if (count(array_values($reportTotals)))
-                            <table class="tablesorter tablesorter-totals" style="display:none">
-                                <thead>
-                                <tr>
-                                    <th>{{ trans("texts.totals") }}</th>
-                                    @foreach (array_values(array_values($reportTotals)[0])[0] as $key => $val)
-                                        <th>{{ trans("texts.{$key}") }}</th>
-                                    @endforeach
-                                </tr>
-                                </thead>
-                                <tbody>
-                                @foreach ($reportTotals as $currencyId => $each)
-                                    @foreach ($each as $dimension => $val)
-                                        <tr>
-                                            <td>{!! Utils::getFromCache($currencyId, 'currencies')->name !!}
-                                                @if ($dimension)
-                                                    - {{ $dimension }}
-                                                @endif
-                                            </td>
-                                            @foreach ($val as $id => $field)
-                                                <td>{!! Utils::formatMoney($field, $currencyId) !!}</td>
-                                            @endforeach
-                                        </tr>
-                                    @endforeach
-                                @endforeach
-                                </tbody>
-                            </table>
-                            <p>&nbsp;</p>
-                    @endif
+        @if (count(array_values($reportTotals)))
+        <table class="tablesorter tablesorter-totals" style="display:none">
+        <thead>
+            <tr>
+                <th>{{ trans("texts.totals") }}</th>
+				@foreach (array_values(array_values($reportTotals)[0])[0] as $key => $val)
+                    <th>{{ trans("texts.{$key}") }}</th>
+                @endforeach
+            </tr>
+        </thead>
+        <tbody>
+            @foreach ($reportTotals as $currencyId => $each)
+				@foreach ($each as $dimension => $val)
+	                <tr>
+	                    <td>{!! Utils::getFromCache($currencyId, 'currencies')->name !!}
+						@if ($dimension)
+							- {{ $dimension }}
+						@endif
+						</td>
+	                    @foreach ($val as $id => $field)
+	                        <td>{!! Utils::formatMoney($field, $currencyId) !!}</td>
+	                    @endforeach
+	                </tr>
+				@endforeach
+            @endforeach
+        </tbody>
+        </table>
+		<p>&nbsp;</p>
+        @endif
 
-                    <!--
+		<!--
 		<div class="columnSelectorWrapper">
 		  <input id="colSelect1" type="checkbox" class="hidden">
 		  <label class="columnSelectorButton" for="colSelect1">Column</label>
@@ -219,153 +219,153 @@
 		</div>
 		-->
 
-                        <table class="tablesorter tablesorter-data" style="display:none">
-                            <thead>
-                            <tr>
-                                {!! $report->tableHeader() !!}
-                            </tr>
-                            </thead>
-                            <tbody>
-                            @if (count($displayData))
-                                @foreach ($displayData as $record)
-                                    <tr>
-                                        @foreach ($record as $field)
-                                            <td>{!! $field !!}</td>
-                                        @endforeach
-                                    </tr>
-                                @endforeach
-                            @else
-                                <tr>
-                                    <td colspan="10" style="text-align: center">{{ trans('texts.empty_table') }}</td>
-                                </tr>
-                            @endif
-                            </tbody>
-                        </table>
+        <table class="tablesorter tablesorter-data" style="display:none">
+        <thead>
+            <tr>
+				{!! $report->tableHeader() !!}
+            </tr>
+        </thead>
+        <tbody>
+            @if (count($displayData))
+                @foreach ($displayData as $record)
+                    <tr>
+                        @foreach ($record as $field)
+                            <td>{!! $field !!}</td>
+                        @endforeach
+                    </tr>
+                @endforeach
+            @else
+                <tr>
+                    <td colspan="10" style="text-align: center">{{ trans('texts.empty_table') }}</td>
+                </tr>
+            @endif
+        </tbody>
+        </table>
 
-                        <br/>
-                        <div style="color:#888888">
-                            {{ trans('texts.reports_help') }}
-                        </div>
-
-                    </div>
-                </div>
+		<br/>
+		<div style="color:#888888">
+			{{ trans('texts.reports_help') }}
+		</div>
 
         </div>
+        </div>
 
-        @endif
+	</div>
 
-        <script type="text/javascript">
+	@endif
 
-            function onExportClick() {
-                $('#action').val('export');
-                $('#submitButton').click();
-                $('#action').val('');
+	<script type="text/javascript">
+
+    function onExportClick() {
+        $('#action').val('export');
+        $('#submitButton').click();
+        $('#action').val('');
+    }
+
+	var sumColumns = [];
+	@foreach ($columns as $column)
+		sumColumns.push("{{ in_array($column, ['amount', 'paid', 'balance', 'cost', 'duration']) ? trans("texts.{$column}") : false }}");
+	@endforeach
+
+    $(function() {
+        $('.start_date .input-group-addon').click(function() {
+            toggleDatePicker('start_date');
+        });
+        $('.end_date .input-group-addon').click(function() {
+            toggleDatePicker('end_date');
+        });
+
+        $('#report_type').change(function() {
+            var val = $('#report_type').val();
+			if (val == '{{ ENTITY_TAX_RATE }}') {
+                $('#dateField').fadeIn();
+            } else {
+                $('#dateField').fadeOut();
             }
+			if (val == '{{ ENTITY_INVOICE }}' || val == '{{ ENTITY_PRODUCT }}') {
+                $('#statusField').fadeIn();
+            } else {
+                $('#statusField').fadeOut();
+            }
+            if (isStorageSupported()) {
+                localStorage.setItem('last:report_type', val);
+            }
+        });
 
-            var sumColumns = [];
-            @foreach ($columns as $column)
-                sumColumns.push("{{ in_array($column, ['amount', 'paid', 'balance', 'cost', 'duration']) ? trans("texts.{$column}") : false }}");
-            @endforeach
+		// parse 1,000.00 or 1.000,00
+		function convertStringToNumber(str) {
+			str = str + '' || '';
+			if (str.indexOf(':') >= 0) {
+				return roundToTwo(moment.duration(str).asHours());
+			} else {
+				var number = Number(str.replace(/[^0-9]+/g, ''));
+				return number / 100;
+			}
+		}
 
-            $(function() {
-                $('.start_date .input-group-addon').click(function() {
-                    toggleDatePicker('start_date');
-                });
-                $('.end_date .input-group-addon').click(function() {
-                    toggleDatePicker('end_date');
-                });
+		$(function(){
+  			$(".tablesorter-data").tablesorter({
+				@if (! request()->group_when_sorted)
+					sortList: [[0,0]],
+				@endif
+				theme: 'bootstrap',
+				widgets: ['zebra', 'uitheme', 'filter'{!! request()->group_when_sorted ? ", 'group'" : "" !!}, 'columnSelector'],
+				headerTemplate : '{content} {icon}',
+				@if ($report)
+					dateFormat: '{{ $report->convertDateFormat() }}',
+				@endif
+				numberSorter: function(a, b, direction) {
+					var a = convertStringToNumber(a);
+					var b = convertStringToNumber(b);
+					return direction ? a - b : b - a;
+				},
+				widgetOptions : {
+					columnSelector_container : $('#columnSelector'),
+					filter_cssFilter: 'form-control',
+					group_collapsed: true,
+					group_saveGroups: false,
+					//group_formatter   : function(txt, col, table, c, wo, data) {},
+					group_callback: function ($cell, $rows, column, table) {
+					  for (var i=0; i<sumColumns.length; i++) {
+						  var label = sumColumns[i];
+						  if (!label) {
+							  continue;
+						  }
+						  var subtotal = 0;
+				          $rows.each(function() {
+				            var txt = $(this).find("td").eq(i).text();
+				            subtotal += convertStringToNumber(txt);
+				          });
+				          $cell.find(".group-count").append(' - ' + label + ': ' + roundToTwo(subtotal));
+					  }
+			        },
+			    }
+			}).show();
 
-                $('#report_type').change(function() {
-                    var val = $('#report_type').val();
-                    if (val == '{{ ENTITY_TAX_RATE }}') {
-                        $('#dateField').fadeIn();
-                    } else {
-                        $('#dateField').fadeOut();
-                    }
-                    if (val == '{{ ENTITY_INVOICE }}' || val == '{{ ENTITY_PRODUCT }}') {
-                        $('#statusField').fadeIn();
-                    } else {
-                        $('#statusField').fadeOut();
-                    }
-                    if (isStorageSupported()) {
-                        localStorage.setItem('last:report_type', val);
-                    }
-                });
+			$(".tablesorter-totals").tablesorter({
+				theme: 'bootstrap',
+				widgets: ['zebra', 'uitheme'],
+			}).show();
 
-                // parse 1,000.00 or 1.000,00
-                function convertStringToNumber(str) {
-                    str = str + '' || '';
-                    if (str.indexOf(':') >= 0) {
-                        return roundToTwo(moment.duration(str).asHours());
-                    } else {
-                        var number = Number(str.replace(/[^0-9]+/g, ''));
-                        return number / 100;
-                    }
-                }
-
-                $(function(){
-                    $(".tablesorter-data").tablesorter({
-                        @if (! request()->group_when_sorted)
-                        sortList: [[0,0]],
-                        @endif
-                        theme: 'bootstrap',
-                        widgets: ['zebra', 'uitheme', 'filter'{!! request()->group_when_sorted ? ", 'group'" : "" !!}, 'columnSelector'],
-                        headerTemplate : '{content} {icon}',
-                        @if ($report)
-                        dateFormat: '{{ $report->convertDateFormat() }}',
-                        @endif
-                        numberSorter: function(a, b, direction) {
-                            var a = convertStringToNumber(a);
-                            var b = convertStringToNumber(b);
-                            return direction ? a - b : b - a;
-                        },
-                        widgetOptions : {
-                            columnSelector_container : $('#columnSelector'),
-                            filter_cssFilter: 'form-control',
-                            group_collapsed: true,
-                            group_saveGroups: false,
-                            //group_formatter   : function(txt, col, table, c, wo, data) {},
-                            group_callback: function ($cell, $rows, column, table) {
-                                for (var i=0; i<sumColumns.length; i++) {
-                                    var label = sumColumns[i];
-                                    if (!label) {
-                                        continue;
-                                    }
-                                    var subtotal = 0;
-                                    $rows.each(function() {
-                                        var txt = $(this).find("td").eq(i).text();
-                                        subtotal += convertStringToNumber(txt);
-                                    });
-                                    $cell.find(".group-count").append(' - ' + label + ': ' + roundToTwo(subtotal));
-                                }
-                            },
-                        }
-                    }).show();
-
-                    $(".tablesorter-totals").tablesorter({
-                        theme: 'bootstrap',
-                        widgets: ['zebra', 'uitheme'],
-                    }).show();
-
-                    var lastReportType = localStorage.getItem('last:report_type');
-                    if (lastReportType) {
-                        $('#report_type').val(lastReportType);
-                    }
-                });
-            })
+			var lastReportType = localStorage.getItem('last:report_type');
+			if (lastReportType) {
+				$('#report_type').val(lastReportType);
+			}
+		});
+    })
 
 
-        </script>
+	</script>
 
-        @stop
+@stop
 
 
-        @section('onReady')
+@section('onReady')
 
-            $('#start_date, #end_date').datepicker({
-            autoclose: true,
-            todayHighlight: true,
-            keyboardNavigation: false
-            });
+	$('#start_date, #end_date').datepicker({
+		autoclose: true,
+		todayHighlight: true,
+		keyboardNavigation: false
+	});
 
 @stop
\ No newline at end of file