diff --git a/app/Abstracts/Report.php b/app/Abstracts/Report.php index 66324dc26..5028c4c44 100644 --- a/app/Abstracts/Report.php +++ b/app/Abstracts/Report.php @@ -270,6 +270,9 @@ abstract class Report case 'yearly': $width = 'w-4/12 col-4'; break; + case 'monthly': + $width = 'col-1'; + break; } if (empty($width)) { diff --git a/public/css/print.css b/public/css/print.css index c3409705e..13374341a 100644 --- a/public/css/print.css +++ b/public/css/print.css @@ -283,7 +283,7 @@ html[dir='rtl'] .text-alignment-left { text-align: right !important; } -html[dir='lte'] .text-alignment-right { +html[dir='ltr'] .text-alignment-right { text-align: right !important; } @@ -681,6 +681,10 @@ html[dir='rtl'] .text-alignment-right { /*--Print--*/ +.col-1 { + width: 8.333333%; +} + .col-2 { width: 16.666667%; } diff --git a/resources/views/components/reports/detail/table/row.blade.php b/resources/views/components/reports/detail/table/row.blade.php index 38ac57180..f5823c7ca 100644 --- a/resources/views/components/reports/detail/table/row.blade.php +++ b/resources/views/components/reports/detail/table/row.blade.php @@ -41,10 +41,10 @@ @if ($row_total = array_sum($parent_row_values)) @if (isset($parent_id)) - + @else - + @endif {{ $class->row_names[$table_key][$id] }} diff --git a/resources/views/reports/profit_loss/content/footer.blade.php b/resources/views/reports/profit_loss/content/footer.blade.php index 59c076e3d..f58f632fa 100644 --- a/resources/views/reports/profit_loss/content/footer.blade.php +++ b/resources/views/reports/profit_loss/content/footer.blade.php @@ -2,7 +2,7 @@ - diff --git a/resources/views/reports/profit_loss/content/header.blade.php b/resources/views/reports/profit_loss/content/header.blade.php index 83f8c3066..284cd78ae 100644 --- a/resources/views/reports/profit_loss/content/header.blade.php +++ b/resources/views/reports/profit_loss/content/header.blade.php @@ -2,7 +2,7 @@
+ {{ trans('reports.net_profit') }}
- + @foreach($class->dates as $date) - diff --git a/resources/views/reports/tax_summary/content/header.blade.php b/resources/views/reports/tax_summary/content/header.blade.php index 9d59c3c25..34be3ec76 100644 --- a/resources/views/reports/tax_summary/content/header.blade.php +++ b/resources/views/reports/tax_summary/content/header.blade.php @@ -2,7 +2,7 @@
   diff --git a/resources/views/reports/profit_loss/table/footer.blade.php b/resources/views/reports/profit_loss/table/footer.blade.php index 887e4036f..d62bc329d 100644 --- a/resources/views/reports/profit_loss/table/footer.blade.php +++ b/resources/views/reports/profit_loss/table/footer.blade.php @@ -2,7 +2,7 @@
+ {{ trans_choice('general.totals', 1) }}
- + @foreach($class->dates as $date) -
   diff --git a/resources/views/reports/tax_summary/table/footer.blade.php b/resources/views/reports/tax_summary/table/footer.blade.php index b9b5ddefb..10ccf6a95 100644 --- a/resources/views/reports/tax_summary/table/footer.blade.php +++ b/resources/views/reports/tax_summary/table/footer.blade.php @@ -2,7 +2,7 @@
+ {{ trans('reports.net') }}