From f37e711baabde9b5552d83ef3f102780a8e4f0e5 Mon Sep 17 00:00:00 2001
From: batuhanbas <b1atuhanb1as@gmail.com>
Date: Wed, 4 Mar 2020 12:28:24 +0300
Subject: [PATCH 01/65] attchment updated for revenue/payment

---
 resources/views/purchases/payments/edit.blade.php | 7 ++++++-
 resources/views/sales/revenues/edit.blade.php     | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/resources/views/purchases/payments/edit.blade.php b/resources/views/purchases/payments/edit.blade.php
index 2f96ce145..c92e93fb6 100644
--- a/resources/views/purchases/payments/edit.blade.php
+++ b/resources/views/purchases/payments/edit.blade.php
@@ -57,7 +57,12 @@
 
                     {{ Form::textGroup('reference', trans('general.reference'), 'file',[]) }}
 
-                    {{ Form::fileGroup('attachment', trans('general.attachment')) }}
+                    <div class="col-md-6">
+                        @if($payment->attachment)
+                            @php $file = $payment->attachment; @endphp
+                            @include('partials.media.file')
+                        @endif
+                    </div>
 
                     @if ($payment->bill)
                         {{ Form::textGroup('document', trans_choice('general.bills', 1), 'file-invoice', ['disabled' => 'disabled'], $payment->bill->bill_number) }}
diff --git a/resources/views/sales/revenues/edit.blade.php b/resources/views/sales/revenues/edit.blade.php
index 0b2889c47..25abb483d 100644
--- a/resources/views/sales/revenues/edit.blade.php
+++ b/resources/views/sales/revenues/edit.blade.php
@@ -57,7 +57,12 @@
 
                     {{ Form::textGroup('reference', trans('general.reference'), 'file',[]) }}
 
-                    {{ Form::fileGroup('attachment', trans('general.attachment')) }}
+                    <div class="col-md-6">
+                        @if($revenue->attachment)
+                            @php $file = $revenue->attachment; @endphp
+                            @include('partials.media.file')
+                        @endif
+                    </div>
 
                     @if ($revenue->invoice)
                         {{ Form::textGroup('document', trans_choice('general.invoices', 1), 'file-invoice', ['disabled' => 'disabled'], $revenue->invoice->invoice_number) }}

From 018eef5be9af964c6d3c4dc75c7547da37c249b9 Mon Sep 17 00:00:00 2001
From: denisdulici <denisdulici@gmail.com>
Date: Wed, 4 Mar 2020 13:40:25 +0300
Subject: [PATCH 02/65] interval must be at least 1

---
 app/Traits/Recurring.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Traits/Recurring.php b/app/Traits/Recurring.php
index 2a71f4195..bbbe671b5 100644
--- a/app/Traits/Recurring.php
+++ b/app/Traits/Recurring.php
@@ -17,7 +17,7 @@ trait Recurring
         }
 
         $frequency = ($request['recurring_frequency'] != 'custom') ? $request['recurring_frequency'] : $request['recurring_custom_frequency'];
-        $interval = ($request['recurring_frequency'] != 'custom') ? 1 : (int) $request['recurring_interval'];
+        $interval = (($request['recurring_frequency'] != 'custom') || ($request['recurring_interval'] < 1)) ? 1 : (int) $request['recurring_interval'];
         $started_at = $request->get('paid_at') ?: ($request->get('invoiced_at') ?: $request->get('billed_at'));
 
         $this->recurring()->create([
@@ -39,7 +39,7 @@ trait Recurring
         }
 
         $frequency = ($request['recurring_frequency'] != 'custom') ? $request['recurring_frequency'] : $request['recurring_custom_frequency'];
-        $interval = ($request['recurring_frequency'] != 'custom') ? 1 : (int) $request['recurring_interval'];
+        $interval = (($request['recurring_frequency'] != 'custom') || ($request['recurring_interval'] < 1)) ? 1 : (int) $request['recurring_interval'];
         $started_at = $request->get('paid_at') ?: ($request->get('invoiced_at') ?: $request->get('billed_at'));
 
         $recurring = $this->recurring();

From 2dd57c508442013902fd6cff0d2b88204d6ebb40 Mon Sep 17 00:00:00 2001
From: denisdulici <denisdulici@gmail.com>
Date: Wed, 4 Mar 2020 13:55:00 +0300
Subject: [PATCH 03/65] fixed upload files

---
 resources/views/purchases/payments/edit.blade.php | 10 ++++++----
 resources/views/sales/revenues/edit.blade.php     | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/resources/views/purchases/payments/edit.blade.php b/resources/views/purchases/payments/edit.blade.php
index c92e93fb6..46e50e34c 100644
--- a/resources/views/purchases/payments/edit.blade.php
+++ b/resources/views/purchases/payments/edit.blade.php
@@ -57,12 +57,14 @@
 
                     {{ Form::textGroup('reference', trans('general.reference'), 'file',[]) }}
 
-                    <div class="col-md-6">
-                        @if($payment->attachment)
+                    @if ($payment->attachment)
+                        <div class="col-md-6">
                             @php $file = $payment->attachment; @endphp
                             @include('partials.media.file')
-                        @endif
-                    </div>
+                        </div>
+                    @else
+                        {{ Form::fileGroup('attachment', trans('general.attachment')) }}
+                    @endif
 
                     @if ($payment->bill)
                         {{ Form::textGroup('document', trans_choice('general.bills', 1), 'file-invoice', ['disabled' => 'disabled'], $payment->bill->bill_number) }}
diff --git a/resources/views/sales/revenues/edit.blade.php b/resources/views/sales/revenues/edit.blade.php
index 25abb483d..4fde29250 100644
--- a/resources/views/sales/revenues/edit.blade.php
+++ b/resources/views/sales/revenues/edit.blade.php
@@ -57,12 +57,14 @@
 
                     {{ Form::textGroup('reference', trans('general.reference'), 'file',[]) }}
 
-                    <div class="col-md-6">
-                        @if($revenue->attachment)
+                    @if ($revenue->attachment)
+                        <div class="col-md-6">
                             @php $file = $revenue->attachment; @endphp
                             @include('partials.media.file')
-                        @endif
-                    </div>
+                        </div>
+                    @else
+                        {{ Form::fileGroup('attachment', trans('general.attachment')) }}
+                    @endif
 
                     @if ($revenue->invoice)
                         {{ Form::textGroup('document', trans_choice('general.invoices', 1), 'file-invoice', ['disabled' => 'disabled'], $revenue->invoice->invoice_number) }}

From 0cac208ee124a5cab2bcf55b436ef4324ee216e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Wed, 4 Mar 2020 14:23:14 +0300
Subject: [PATCH 04/65] update composer.lock file

---
 composer.lock | 374 +++++++++++++++++++++++++-------------------------
 1 file changed, 187 insertions(+), 187 deletions(-)

diff --git a/composer.lock b/composer.lock
index d531cb2ef..1209bd6e3 100644
--- a/composer.lock
+++ b/composer.lock
@@ -8,16 +8,16 @@
     "packages": [
         {
             "name": "akaunting/firewall",
-            "version": "1.2.7",
+            "version": "1.2.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/akaunting/firewall.git",
-                "reference": "645e06c886f6c8c5afc3c31a81d6f8ea41170e01"
+                "reference": "3ab35b816a3aa6ee60c630c2ba53563ff5bd3c7e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/akaunting/firewall/zipball/645e06c886f6c8c5afc3c31a81d6f8ea41170e01",
-                "reference": "645e06c886f6c8c5afc3c31a81d6f8ea41170e01",
+                "url": "https://api.github.com/repos/akaunting/firewall/zipball/3ab35b816a3aa6ee60c630c2ba53563ff5bd3c7e",
+                "reference": "3ab35b816a3aa6ee60c630c2ba53563ff5bd3c7e",
                 "shasum": ""
             },
             "require": {
@@ -67,7 +67,7 @@
                 "waf",
                 "xss"
             ],
-            "time": "2020-01-30T22:24:37+00:00"
+            "time": "2020-02-24T22:27:02+00:00"
         },
         {
             "name": "akaunting/language",
@@ -485,26 +485,26 @@
         },
         {
             "name": "barryvdh/laravel-debugbar",
-            "version": "v3.2.8",
+            "version": "v3.2.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/barryvdh/laravel-debugbar.git",
-                "reference": "18208d64897ab732f6c04a19b319fe8f1d57a9c0"
+                "reference": "42d5da5379a7860093f8e4032167e4cb5ebec180"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/18208d64897ab732f6c04a19b319fe8f1d57a9c0",
-                "reference": "18208d64897ab732f6c04a19b319fe8f1d57a9c0",
+                "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/42d5da5379a7860093f8e4032167e4cb5ebec180",
+                "reference": "42d5da5379a7860093f8e4032167e4cb5ebec180",
                 "shasum": ""
             },
             "require": {
-                "illuminate/routing": "^5.5|^6",
-                "illuminate/session": "^5.5|^6",
-                "illuminate/support": "^5.5|^6",
-                "maximebf/debugbar": "~1.15.0",
+                "illuminate/routing": "^5.5|^6|^7",
+                "illuminate/session": "^5.5|^6|^7",
+                "illuminate/support": "^5.5|^6|^7",
+                "maximebf/debugbar": "^1.15.1",
                 "php": ">=7.0",
-                "symfony/debug": "^3|^4",
-                "symfony/finder": "^3|^4"
+                "symfony/debug": "^3|^4|^5",
+                "symfony/finder": "^3|^4|^5"
             },
             "require-dev": {
                 "laravel/framework": "5.5.x"
@@ -549,25 +549,25 @@
                 "profiler",
                 "webprofiler"
             ],
-            "time": "2019-08-29T07:01:03+00:00"
+            "time": "2020-02-25T20:42:23+00:00"
         },
         {
             "name": "barryvdh/laravel-dompdf",
-            "version": "v0.8.5",
+            "version": "v0.8.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/barryvdh/laravel-dompdf.git",
-                "reference": "7393732b2f3a3ee357974cbb0c46c9b65b84dad1"
+                "reference": "d7108f78cf5254a2d8c224542967f133e5a6d4e8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/7393732b2f3a3ee357974cbb0c46c9b65b84dad1",
-                "reference": "7393732b2f3a3ee357974cbb0c46c9b65b84dad1",
+                "url": "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/d7108f78cf5254a2d8c224542967f133e5a6d4e8",
+                "reference": "d7108f78cf5254a2d8c224542967f133e5a6d4e8",
                 "shasum": ""
             },
             "require": {
                 "dompdf/dompdf": "^0.8",
-                "illuminate/support": "^5.5|^6",
+                "illuminate/support": "^5.5|^6|^7",
                 "php": ">=7"
             },
             "type": "library",
@@ -605,37 +605,37 @@
                 "laravel",
                 "pdf"
             ],
-            "time": "2019-08-23T14:30:33+00:00"
+            "time": "2020-02-25T20:44:34+00:00"
         },
         {
             "name": "barryvdh/laravel-ide-helper",
-            "version": "v2.6.6",
+            "version": "v2.6.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/barryvdh/laravel-ide-helper.git",
-                "reference": "b91b959364d97af658f268c733c75dccdbff197e"
+                "reference": "edd69c5e0508972c81f1f7173236de2459c45814"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/b91b959364d97af658f268c733c75dccdbff197e",
-                "reference": "b91b959364d97af658f268c733c75dccdbff197e",
+                "url": "https://api.github.com/repos/barryvdh/laravel-ide-helper/zipball/edd69c5e0508972c81f1f7173236de2459c45814",
+                "reference": "edd69c5e0508972c81f1f7173236de2459c45814",
                 "shasum": ""
             },
             "require": {
                 "barryvdh/reflection-docblock": "^2.0.6",
                 "composer/composer": "^1.6",
                 "doctrine/dbal": "~2.3",
-                "illuminate/console": "^5.5|^6",
-                "illuminate/filesystem": "^5.5|^6",
-                "illuminate/support": "^5.5|^6",
-                "php": ">=7"
+                "illuminate/console": "^5.5|^6|^7",
+                "illuminate/filesystem": "^5.5|^6|^7",
+                "illuminate/support": "^5.5|^6|^7",
+                "php": ">=7.2"
             },
             "require-dev": {
-                "illuminate/config": "^5.5|^6",
-                "illuminate/view": "^5.5|^6",
-                "phpro/grumphp": "^0.14",
-                "phpunit/phpunit": "4.*",
-                "scrutinizer/ocular": "~1.1",
+                "illuminate/config": "^5.5|^6|^7",
+                "illuminate/view": "^5.5|^6|^7",
+                "mockery/mockery": "^1.3",
+                "orchestra/testbench": "^3|^4",
+                "phpro/grumphp": "^0.17.1",
                 "squizlabs/php_codesniffer": "^3"
             },
             "type": "library",
@@ -676,7 +676,7 @@
                 "phpstorm",
                 "sublime"
             ],
-            "time": "2019-10-30T20:53:27+00:00"
+            "time": "2020-02-25T20:41:32+00:00"
         },
         {
             "name": "barryvdh/reflection-docblock",
@@ -1041,16 +1041,16 @@
         },
         {
             "name": "composer/xdebug-handler",
-            "version": "1.4.0",
+            "version": "1.4.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "cbe23383749496fe0f373345208b79568e4bc248"
+                "reference": "1ab9842d69e64fb3a01be6b656501032d1b78cb7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/cbe23383749496fe0f373345208b79568e4bc248",
-                "reference": "cbe23383749496fe0f373345208b79568e4bc248",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/1ab9842d69e64fb3a01be6b656501032d1b78cb7",
+                "reference": "1ab9842d69e64fb3a01be6b656501032d1b78cb7",
                 "shasum": ""
             },
             "require": {
@@ -1081,26 +1081,26 @@
                 "Xdebug",
                 "performance"
             ],
-            "time": "2019-11-06T16:40:04+00:00"
+            "time": "2020-03-01T12:26:26+00:00"
         },
         {
             "name": "consoletvs/charts",
-            "version": "6.5.3",
+            "version": "6.5.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ConsoleTVs/Charts.git",
-                "reference": "a4a8a71c438a00b95ea74a080ce5bf8916c60918"
+                "reference": "524257b5d525666385bd2e91b06e376994a7b683"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ConsoleTVs/Charts/zipball/a4a8a71c438a00b95ea74a080ce5bf8916c60918",
-                "reference": "a4a8a71c438a00b95ea74a080ce5bf8916c60918",
+                "url": "https://api.github.com/repos/ConsoleTVs/Charts/zipball/524257b5d525666385bd2e91b06e376994a7b683",
+                "reference": "524257b5d525666385bd2e91b06e376994a7b683",
                 "shasum": ""
             },
             "require": {
                 "balping/json-raw-encoder": "^1.0",
-                "illuminate/console": "^5.0|^6.0",
-                "illuminate/support": "^5.0|^6.0",
+                "illuminate/console": "^5.0|^6.0|^7.0",
+                "illuminate/support": "^5.0|^6.0|^7.0",
                 "php": ">=7.0"
             },
             "type": "library",
@@ -1127,7 +1127,7 @@
                 }
             ],
             "description": "The laravel charting package",
-            "time": "2019-09-03T16:50:50+00:00"
+            "time": "2020-03-03T23:16:14+00:00"
         },
         {
             "name": "consoletvs/identify",
@@ -2551,16 +2551,16 @@
         },
         {
             "name": "jaybizzle/crawler-detect",
-            "version": "v1.2.93",
+            "version": "v1.2.94",
             "source": {
                 "type": "git",
                 "url": "https://github.com/JayBizzle/Crawler-Detect.git",
-                "reference": "608ec84bdf85fa8200c0f36f455483698b450ecd"
+                "reference": "fbd4c12741583fb9d8f0bcbf65248a34eed68fc9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/608ec84bdf85fa8200c0f36f455483698b450ecd",
-                "reference": "608ec84bdf85fa8200c0f36f455483698b450ecd",
+                "url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/fbd4c12741583fb9d8f0bcbf65248a34eed68fc9",
+                "reference": "fbd4c12741583fb9d8f0bcbf65248a34eed68fc9",
                 "shasum": ""
             },
             "require": {
@@ -2596,7 +2596,7 @@
                 "crawlerdetect",
                 "php crawler detect"
             ],
-            "time": "2020-02-16T12:34:48+00:00"
+            "time": "2020-02-20T21:42:59+00:00"
         },
         {
             "name": "jenssegers/agent",
@@ -2845,16 +2845,16 @@
         },
         {
             "name": "kyslik/column-sortable",
-            "version": "6.2.0",
+            "version": "6.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Kyslik/column-sortable.git",
-                "reference": "4b628bffdb1724284dd0ae091262d24790225768"
+                "reference": "2fecd327c29ae925bf951f787a41e4e7ca315446"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Kyslik/column-sortable/zipball/4b628bffdb1724284dd0ae091262d24790225768",
-                "reference": "4b628bffdb1724284dd0ae091262d24790225768",
+                "url": "https://api.github.com/repos/Kyslik/column-sortable/zipball/2fecd327c29ae925bf951f787a41e4e7ca315446",
+                "reference": "2fecd327c29ae925bf951f787a41e4e7ca315446",
                 "shasum": ""
             },
             "require": {
@@ -2898,7 +2898,7 @@
                 "sortable",
                 "sorting"
             ],
-            "time": "2019-10-14T19:39:29+00:00"
+            "time": "2020-03-01T20:53:06+00:00"
         },
         {
             "name": "laracasts/flash",
@@ -2956,16 +2956,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v6.16.0",
+            "version": "v6.18.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "b47217e41868d3049ec545cbb713aa94c6f39e55"
+                "reference": "077b895d935b7fbcfb1d1eb34217fa4f80a130d8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/b47217e41868d3049ec545cbb713aa94c6f39e55",
-                "reference": "b47217e41868d3049ec545cbb713aa94c6f39e55",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/077b895d935b7fbcfb1d1eb34217fa4f80a130d8",
+                "reference": "077b895d935b7fbcfb1d1eb34217fa4f80a130d8",
                 "shasum": ""
             },
             "require": {
@@ -3098,7 +3098,7 @@
                 "framework",
                 "laravel"
             ],
-            "time": "2020-02-18T15:17:52+00:00"
+            "time": "2020-03-03T13:14:27+00:00"
         },
         {
             "name": "laravel/tinker",
@@ -3233,16 +3233,16 @@
         },
         {
             "name": "league/commonmark",
-            "version": "1.3.0",
+            "version": "1.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "4f30be7a2cbf3bfa5788abab71384713e48f451f"
+                "reference": "8015f806173c6ee54de25a87c2d69736696e88db"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/4f30be7a2cbf3bfa5788abab71384713e48f451f",
-                "reference": "4f30be7a2cbf3bfa5788abab71384713e48f451f",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/8015f806173c6ee54de25a87c2d69736696e88db",
+                "reference": "8015f806173c6ee54de25a87c2d69736696e88db",
                 "shasum": ""
             },
             "require": {
@@ -3303,7 +3303,7 @@
                 "md",
                 "parser"
             ],
-            "time": "2020-02-08T23:42:03+00:00"
+            "time": "2020-02-28T18:53:50+00:00"
         },
         {
             "name": "league/flysystem",
@@ -3455,23 +3455,23 @@
         },
         {
             "name": "lorisleiva/laravel-search-string",
-            "version": "v0.1.4",
+            "version": "v0.1.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/lorisleiva/laravel-search-string.git",
-                "reference": "669cc42ca23756bebbfcd3bb610c3c332e511227"
+                "reference": "5fd936cb2dd9e604a5786cfbacf0e1e0eb538e8f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/lorisleiva/laravel-search-string/zipball/669cc42ca23756bebbfcd3bb610c3c332e511227",
-                "reference": "669cc42ca23756bebbfcd3bb610c3c332e511227",
+                "url": "https://api.github.com/repos/lorisleiva/laravel-search-string/zipball/5fd936cb2dd9e604a5786cfbacf0e1e0eb538e8f",
+                "reference": "5fd936cb2dd9e604a5786cfbacf0e1e0eb538e8f",
                 "shasum": ""
             },
             "require": {
-                "illuminate/support": "5.5.*|5.6.*|5.7.*|5.8.*|^6.0"
+                "illuminate/support": "^5.5|^6.0|^7.0"
             },
             "require-dev": {
-                "orchestra/testbench": "3.8.*|^4.0"
+                "orchestra/testbench": "^5.0"
             },
             "type": "library",
             "extra": {
@@ -3497,25 +3497,25 @@
                 }
             ],
             "description": "Generates database queries based on one unique string using a simple and customizable syntax.",
-            "time": "2019-09-11T09:02:26+00:00"
+            "time": "2020-03-01T14:09:46+00:00"
         },
         {
             "name": "maatwebsite/excel",
-            "version": "3.1.18",
+            "version": "3.1.19",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Maatwebsite/Laravel-Excel.git",
-                "reference": "d0231ab1f4bb93c8695630cb445ada1fdc54add0"
+                "reference": "96527a9ebc2e79e9a5fa7eaef7e23c9e9bcc587c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/d0231ab1f4bb93c8695630cb445ada1fdc54add0",
-                "reference": "d0231ab1f4bb93c8695630cb445ada1fdc54add0",
+                "url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/96527a9ebc2e79e9a5fa7eaef7e23c9e9bcc587c",
+                "reference": "96527a9ebc2e79e9a5fa7eaef7e23c9e9bcc587c",
                 "shasum": ""
             },
             "require": {
                 "ext-json": "*",
-                "illuminate/support": "5.5.*|5.6.*|5.7.*|5.8.*|^6.0",
+                "illuminate/support": "5.5.*|5.6.*|5.7.*|5.8.*|^6.0|^7.0",
                 "php": "^7.0",
                 "phpoffice/phpspreadsheet": "^1.10"
             },
@@ -3564,7 +3564,7 @@
                 "php",
                 "phpspreadsheet"
             ],
-            "time": "2019-12-24T10:40:12+00:00"
+            "time": "2020-02-28T15:47:45+00:00"
         },
         {
             "name": "markbaker/complex",
@@ -3732,22 +3732,22 @@
         },
         {
             "name": "maximebf/debugbar",
-            "version": "v1.15.1",
+            "version": "v1.16.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/maximebf/php-debugbar.git",
-                "reference": "6c4277f6117e4864966c9cb58fb835cee8c74a1e"
+                "reference": "58998b818c6567fac01e35b8a4b70c1a64530556"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/6c4277f6117e4864966c9cb58fb835cee8c74a1e",
-                "reference": "6c4277f6117e4864966c9cb58fb835cee8c74a1e",
+                "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/58998b818c6567fac01e35b8a4b70c1a64530556",
+                "reference": "58998b818c6567fac01e35b8a4b70c1a64530556",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.6",
+                "php": "^7.1",
                 "psr/log": "^1.0",
-                "symfony/var-dumper": "^2.6|^3|^4"
+                "symfony/var-dumper": "^2.6|^3|^4|^5"
             },
             "require-dev": {
                 "phpunit/phpunit": "^5"
@@ -3760,7 +3760,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.15-dev"
+                    "dev-master": "1.16-dev"
                 }
             },
             "autoload": {
@@ -3789,7 +3789,7 @@
                 "debug",
                 "debugbar"
             ],
-            "time": "2019-09-24T14:55:42+00:00"
+            "time": "2019-11-24T09:46:11+00:00"
         },
         {
             "name": "misterphilip/maintenance-mode",
@@ -4036,16 +4036,16 @@
         },
         {
             "name": "nesbot/carbon",
-            "version": "2.30.0",
+            "version": "2.31.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/briannesbitt/Carbon.git",
-                "reference": "912dff66d2690ca66abddb9b291a1df5f371d3b4"
+                "reference": "bbc0ab53f41a4c6f223c18efcdbd9bc725eb5d2d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/912dff66d2690ca66abddb9b291a1df5f371d3b4",
-                "reference": "912dff66d2690ca66abddb9b291a1df5f371d3b4",
+                "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/bbc0ab53f41a4c6f223c18efcdbd9bc725eb5d2d",
+                "reference": "bbc0ab53f41a4c6f223c18efcdbd9bc725eb5d2d",
                 "shasum": ""
             },
             "require": {
@@ -4102,7 +4102,7 @@
                 "datetime",
                 "time"
             ],
-            "time": "2020-02-07T15:25:46+00:00"
+            "time": "2020-03-01T11:11:58+00:00"
         },
         {
             "name": "nikic/php-parser",
@@ -4445,26 +4445,25 @@
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "1.0.1",
+            "version": "1.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9"
+                "reference": "7462d5f123dfc080dfdf26897032a6513644fc95"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/2e32a6d48972b2c1976ed5d8967145b6cec4a4a9",
-                "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/7462d5f123dfc080dfdf26897032a6513644fc95",
+                "reference": "7462d5f123dfc080dfdf26897032a6513644fc95",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1",
+                "php": "^7.2",
                 "phpdocumentor/reflection-common": "^2.0"
             },
             "require-dev": {
-                "ext-tokenizer": "^7.1",
-                "mockery/mockery": "~1",
-                "phpunit/phpunit": "^7.0"
+                "ext-tokenizer": "^7.2",
+                "mockery/mockery": "~1"
             },
             "type": "library",
             "extra": {
@@ -4488,20 +4487,20 @@
                 }
             ],
             "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
-            "time": "2019-08-22T18:11:29+00:00"
+            "time": "2020-02-18T18:59:58+00:00"
         },
         {
             "name": "phpoffice/phpspreadsheet",
-            "version": "1.10.1",
+            "version": "1.11.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPOffice/PhpSpreadsheet.git",
-                "reference": "1648dc9ebef6ebe0c5a172e16cf66732918416e0"
+                "reference": "c2a205e82f9cf1cc9fab86b79e808d86dd680470"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/1648dc9ebef6ebe0c5a172e16cf66732918416e0",
-                "reference": "1648dc9ebef6ebe0c5a172e16cf66732918416e0",
+                "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/c2a205e82f9cf1cc9fab86b79e808d86dd680470",
+                "reference": "c2a205e82f9cf1cc9fab86b79e808d86dd680470",
                 "shasum": ""
             },
             "require": {
@@ -4581,7 +4580,7 @@
                 "xls",
                 "xlsx"
             ],
-            "time": "2019-12-01T23:13:51+00:00"
+            "time": "2020-03-02T13:09:03+00:00"
         },
         {
             "name": "phpoption/phpoption",
@@ -5566,16 +5565,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v4.4.4",
+            "version": "v4.4.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "f512001679f37e6a042b51897ed24a2f05eba656"
+                "reference": "4fa15ae7be74e53f6ec8c83ed403b97e23b665e9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/f512001679f37e6a042b51897ed24a2f05eba656",
-                "reference": "f512001679f37e6a042b51897ed24a2f05eba656",
+                "url": "https://api.github.com/repos/symfony/console/zipball/4fa15ae7be74e53f6ec8c83ed403b97e23b665e9",
+                "reference": "4fa15ae7be74e53f6ec8c83ed403b97e23b665e9",
                 "shasum": ""
             },
             "require": {
@@ -5638,20 +5637,20 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
-            "time": "2020-01-25T12:44:29+00:00"
+            "time": "2020-02-24T13:10:00+00:00"
         },
         {
             "name": "symfony/css-selector",
-            "version": "v5.0.4",
+            "version": "v5.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/css-selector.git",
-                "reference": "ff60c90cb7950b592ebc84ad1289d0345bf24f9f"
+                "reference": "a0b51ba9938ccc206d9284de7eb527c2d4550b44"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/css-selector/zipball/ff60c90cb7950b592ebc84ad1289d0345bf24f9f",
-                "reference": "ff60c90cb7950b592ebc84ad1289d0345bf24f9f",
+                "url": "https://api.github.com/repos/symfony/css-selector/zipball/a0b51ba9938ccc206d9284de7eb527c2d4550b44",
+                "reference": "a0b51ba9938ccc206d9284de7eb527c2d4550b44",
                 "shasum": ""
             },
             "require": {
@@ -5691,20 +5690,20 @@
             ],
             "description": "Symfony CssSelector Component",
             "homepage": "https://symfony.com",
-            "time": "2020-01-04T14:08:26+00:00"
+            "time": "2020-02-04T09:41:09+00:00"
         },
         {
             "name": "symfony/debug",
-            "version": "v4.4.4",
+            "version": "v4.4.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/debug.git",
-                "reference": "20236471058bbaa9907382500fc14005c84601f0"
+                "reference": "a980d87a659648980d89193fd8b7a7ca89d97d21"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/debug/zipball/20236471058bbaa9907382500fc14005c84601f0",
-                "reference": "20236471058bbaa9907382500fc14005c84601f0",
+                "url": "https://api.github.com/repos/symfony/debug/zipball/a980d87a659648980d89193fd8b7a7ca89d97d21",
+                "reference": "a980d87a659648980d89193fd8b7a7ca89d97d21",
                 "shasum": ""
             },
             "require": {
@@ -5747,26 +5746,26 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
-            "time": "2020-01-25T12:44:29+00:00"
+            "time": "2020-02-23T14:41:43+00:00"
         },
         {
             "name": "symfony/error-handler",
-            "version": "v4.4.4",
+            "version": "v4.4.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/error-handler.git",
-                "reference": "d2721499ffcaf246a743e01cdf6696d3d5dd74c1"
+                "reference": "89aa4b9ac6f1f35171b8621b24f60477312085be"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/error-handler/zipball/d2721499ffcaf246a743e01cdf6696d3d5dd74c1",
-                "reference": "d2721499ffcaf246a743e01cdf6696d3d5dd74c1",
+                "url": "https://api.github.com/repos/symfony/error-handler/zipball/89aa4b9ac6f1f35171b8621b24f60477312085be",
+                "reference": "89aa4b9ac6f1f35171b8621b24f60477312085be",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1.3",
                 "psr/log": "~1.0",
-                "symfony/debug": "^4.4",
+                "symfony/debug": "^4.4.5",
                 "symfony/var-dumper": "^4.4|^5.0"
             },
             "require-dev": {
@@ -5803,20 +5802,20 @@
             ],
             "description": "Symfony ErrorHandler Component",
             "homepage": "https://symfony.com",
-            "time": "2020-01-27T09:48:47+00:00"
+            "time": "2020-02-26T11:45:31+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v4.4.4",
+            "version": "v4.4.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "9e3de195e5bc301704dd6915df55892f6dfc208b"
+                "reference": "4ad8e149799d3128621a3a1f70e92b9897a8930d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/9e3de195e5bc301704dd6915df55892f6dfc208b",
-                "reference": "9e3de195e5bc301704dd6915df55892f6dfc208b",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/4ad8e149799d3128621a3a1f70e92b9897a8930d",
+                "reference": "4ad8e149799d3128621a3a1f70e92b9897a8930d",
                 "shasum": ""
             },
             "require": {
@@ -5873,7 +5872,7 @@
             ],
             "description": "Symfony EventDispatcher Component",
             "homepage": "https://symfony.com",
-            "time": "2020-01-10T21:54:01+00:00"
+            "time": "2020-02-04T09:32:40+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
@@ -5935,7 +5934,7 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v4.4.4",
+            "version": "v4.4.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
@@ -5985,16 +5984,16 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v4.4.4",
+            "version": "v4.4.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "3a50be43515590faf812fbd7708200aabc327ec3"
+                "reference": "ea69c129aed9fdeca781d4b77eb20b62cf5d5357"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/3a50be43515590faf812fbd7708200aabc327ec3",
-                "reference": "3a50be43515590faf812fbd7708200aabc327ec3",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/ea69c129aed9fdeca781d4b77eb20b62cf5d5357",
+                "reference": "ea69c129aed9fdeca781d4b77eb20b62cf5d5357",
                 "shasum": ""
             },
             "require": {
@@ -6030,20 +6029,20 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
-            "time": "2020-01-04T13:00:46+00:00"
+            "time": "2020-02-14T07:42:58+00:00"
         },
         {
             "name": "symfony/http-foundation",
-            "version": "v4.4.4",
+            "version": "v4.4.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-foundation.git",
-                "reference": "491a20dfa87e0b3990170593bc2de0bb34d828a5"
+                "reference": "7e41b4fcad4619535f45f8bfa7744c4f384e1648"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/491a20dfa87e0b3990170593bc2de0bb34d828a5",
-                "reference": "491a20dfa87e0b3990170593bc2de0bb34d828a5",
+                "url": "https://api.github.com/repos/symfony/http-foundation/zipball/7e41b4fcad4619535f45f8bfa7744c4f384e1648",
+                "reference": "7e41b4fcad4619535f45f8bfa7744c4f384e1648",
                 "shasum": ""
             },
             "require": {
@@ -6085,20 +6084,20 @@
             ],
             "description": "Symfony HttpFoundation Component",
             "homepage": "https://symfony.com",
-            "time": "2020-01-31T09:11:17+00:00"
+            "time": "2020-02-13T19:40:01+00:00"
         },
         {
             "name": "symfony/http-kernel",
-            "version": "v4.4.4",
+            "version": "v4.4.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-kernel.git",
-                "reference": "62116a9c8fb15faabb158ad9cb785c353c2572e5"
+                "reference": "8c8734486dada83a6041ab744709bdc1651a8462"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/62116a9c8fb15faabb158ad9cb785c353c2572e5",
-                "reference": "62116a9c8fb15faabb158ad9cb785c353c2572e5",
+                "url": "https://api.github.com/repos/symfony/http-kernel/zipball/8c8734486dada83a6041ab744709bdc1651a8462",
+                "reference": "8c8734486dada83a6041ab744709bdc1651a8462",
                 "shasum": ""
             },
             "require": {
@@ -6175,20 +6174,20 @@
             ],
             "description": "Symfony HttpKernel Component",
             "homepage": "https://symfony.com",
-            "time": "2020-01-31T12:45:06+00:00"
+            "time": "2020-02-29T10:31:38+00:00"
         },
         {
             "name": "symfony/mime",
-            "version": "v5.0.4",
+            "version": "v5.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/mime.git",
-                "reference": "2a3c7fee1f1a0961fa9cf360d5da553d05095e59"
+                "reference": "9b3e5b5e58c56bbd76628c952d2b78556d305f3c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/mime/zipball/2a3c7fee1f1a0961fa9cf360d5da553d05095e59",
-                "reference": "2a3c7fee1f1a0961fa9cf360d5da553d05095e59",
+                "url": "https://api.github.com/repos/symfony/mime/zipball/9b3e5b5e58c56bbd76628c952d2b78556d305f3c",
+                "reference": "9b3e5b5e58c56bbd76628c952d2b78556d305f3c",
                 "shasum": ""
             },
             "require": {
@@ -6237,7 +6236,7 @@
                 "mime",
                 "mime-type"
             ],
-            "time": "2020-01-04T14:08:26+00:00"
+            "time": "2020-02-04T09:41:09+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -6592,16 +6591,16 @@
         },
         {
             "name": "symfony/process",
-            "version": "v4.4.4",
+            "version": "v4.4.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "f5697ab4cb14a5deed7473819e63141bf5352c36"
+                "reference": "bf9166bac906c9e69fb7a11d94875e7ced97bcd7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/f5697ab4cb14a5deed7473819e63141bf5352c36",
-                "reference": "f5697ab4cb14a5deed7473819e63141bf5352c36",
+                "url": "https://api.github.com/repos/symfony/process/zipball/bf9166bac906c9e69fb7a11d94875e7ced97bcd7",
+                "reference": "bf9166bac906c9e69fb7a11d94875e7ced97bcd7",
                 "shasum": ""
             },
             "require": {
@@ -6637,20 +6636,20 @@
             ],
             "description": "Symfony Process Component",
             "homepage": "https://symfony.com",
-            "time": "2020-01-09T09:50:08+00:00"
+            "time": "2020-02-07T20:06:44+00:00"
         },
         {
             "name": "symfony/routing",
-            "version": "v4.4.4",
+            "version": "v4.4.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/routing.git",
-                "reference": "7bf4e38573728e317b926ca4482ad30470d0e86a"
+                "reference": "4124d621d0e445732520037f888a0456951bde8c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/routing/zipball/7bf4e38573728e317b926ca4482ad30470d0e86a",
-                "reference": "7bf4e38573728e317b926ca4482ad30470d0e86a",
+                "url": "https://api.github.com/repos/symfony/routing/zipball/4124d621d0e445732520037f888a0456951bde8c",
+                "reference": "4124d621d0e445732520037f888a0456951bde8c",
                 "shasum": ""
             },
             "require": {
@@ -6713,7 +6712,7 @@
                 "uri",
                 "url"
             ],
-            "time": "2020-01-08T17:29:02+00:00"
+            "time": "2020-02-25T12:41:09+00:00"
         },
         {
             "name": "symfony/service-contracts",
@@ -6775,16 +6774,16 @@
         },
         {
             "name": "symfony/translation",
-            "version": "v4.4.4",
+            "version": "v4.4.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/translation.git",
-                "reference": "f5d2ac46930238b30a9c2f1b17c905f3697d808c"
+                "reference": "0a19a77fba20818a969ef03fdaf1602de0546353"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/translation/zipball/f5d2ac46930238b30a9c2f1b17c905f3697d808c",
-                "reference": "f5d2ac46930238b30a9c2f1b17c905f3697d808c",
+                "url": "https://api.github.com/repos/symfony/translation/zipball/0a19a77fba20818a969ef03fdaf1602de0546353",
+                "reference": "0a19a77fba20818a969ef03fdaf1602de0546353",
                 "shasum": ""
             },
             "require": {
@@ -6847,7 +6846,7 @@
             ],
             "description": "Symfony Translation Component",
             "homepage": "https://symfony.com",
-            "time": "2020-01-15T13:29:06+00:00"
+            "time": "2020-02-04T09:32:40+00:00"
         },
         {
             "name": "symfony/translation-contracts",
@@ -6908,16 +6907,16 @@
         },
         {
             "name": "symfony/var-dumper",
-            "version": "v4.4.4",
+            "version": "v4.4.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "46b53fd714568af343953c039ff47b67ce8af8d6"
+                "reference": "2572839911702b0405479410ea7a1334bfab0b96"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/46b53fd714568af343953c039ff47b67ce8af8d6",
-                "reference": "46b53fd714568af343953c039ff47b67ce8af8d6",
+                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/2572839911702b0405479410ea7a1334bfab0b96",
+                "reference": "2572839911702b0405479410ea7a1334bfab0b96",
                 "shasum": ""
             },
             "require": {
@@ -6980,7 +6979,7 @@
                 "debug",
                 "dump"
             ],
-            "time": "2020-01-25T12:44:29+00:00"
+            "time": "2020-02-24T13:10:00+00:00"
         },
         {
             "name": "tijsverkoyen/css-to-inline-styles",
@@ -7257,23 +7256,23 @@
         },
         {
             "name": "facade/flare-client-php",
-            "version": "1.3.1",
+            "version": "1.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/facade/flare-client-php.git",
-                "reference": "24444ea0e1556f0a4b5fc8e61802caf72ae9a408"
+                "reference": "db1e03426e7f9472c9ecd1092aff00f56aa6c004"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/facade/flare-client-php/zipball/24444ea0e1556f0a4b5fc8e61802caf72ae9a408",
-                "reference": "24444ea0e1556f0a4b5fc8e61802caf72ae9a408",
+                "url": "https://api.github.com/repos/facade/flare-client-php/zipball/db1e03426e7f9472c9ecd1092aff00f56aa6c004",
+                "reference": "db1e03426e7f9472c9ecd1092aff00f56aa6c004",
                 "shasum": ""
             },
             "require": {
                 "facade/ignition-contracts": "~1.0",
-                "illuminate/pipeline": "~5.5|~5.6|~5.7|~5.8|^6.0",
+                "illuminate/pipeline": "^5.5|^6.0|^7.0",
                 "php": "^7.1",
-                "symfony/http-foundation": "~3.3|~4.1",
+                "symfony/http-foundation": "^3.3|^4.1|^5.0",
                 "symfony/var-dumper": "^3.4|^4.0|^5.0"
             },
             "require-dev": {
@@ -7307,7 +7306,7 @@
                 "flare",
                 "reporting"
             ],
-            "time": "2019-12-15T18:28:38+00:00"
+            "time": "2020-03-02T15:52:04+00:00"
         },
         {
             "name": "facade/ignition",
@@ -8262,16 +8261,16 @@
         },
         {
             "name": "scrivo/highlight.php",
-            "version": "v9.18.1.0",
+            "version": "v9.18.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/scrivo/highlight.php.git",
-                "reference": "a57c858cb753f543965a1e17af386a648012ed8f"
+                "reference": "52fc21c99fd888e33aed4879e55a3646f8d40558"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/scrivo/highlight.php/zipball/a57c858cb753f543965a1e17af386a648012ed8f",
-                "reference": "a57c858cb753f543965a1e17af386a648012ed8f",
+                "url": "https://api.github.com/repos/scrivo/highlight.php/zipball/52fc21c99fd888e33aed4879e55a3646f8d40558",
+                "reference": "52fc21c99fd888e33aed4879e55a3646f8d40558",
                 "shasum": ""
             },
             "require": {
@@ -8281,6 +8280,7 @@
             },
             "require-dev": {
                 "phpunit/phpunit": "^4.8|^5.7",
+                "sabberworm/php-css-parser": "^8.3",
                 "symfony/finder": "^2.8|^3.4",
                 "symfony/var-dumper": "^2.8|^3.4"
             },
@@ -8326,7 +8326,7 @@
                 "highlight.php",
                 "syntax"
             ],
-            "time": "2020-02-03T02:19:36+00:00"
+            "time": "2020-03-02T05:59:21+00:00"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",

From 08ee6e3ef912f554514d25454ad2630d3f404e12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Wed, 4 Mar 2020 15:13:40 +0300
Subject: [PATCH 05/65] Customer create issue solved.

---
 app/Http/Requests/Common/Contact.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Requests/Common/Contact.php b/app/Http/Requests/Common/Contact.php
index 85445643e..b69cce146 100644
--- a/app/Http/Requests/Common/Contact.php
+++ b/app/Http/Requests/Common/Contact.php
@@ -37,7 +37,7 @@ class Contact extends FormRequest
             $id = null;
         }
 
-        if (!empty($this->request->get('create_user')) && empty($this->request->get('user_id'))) {
+        if (($this->request->get('create_user', 'false') === 'true') && empty($this->request->get('user_id'))) {
             $required = 'required|';
         }
 

From 0dea12591994f8aa72a98dc3eb8781ccf1465930 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Wed, 4 Mar 2020 15:53:15 +0300
Subject: [PATCH 06/65] Create customer to user issue solved..

---
 app/Jobs/Common/CreateContact.php | 2 +-
 app/Jobs/Common/UpdateContact.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Jobs/Common/CreateContact.php b/app/Jobs/Common/CreateContact.php
index 6b30924b6..b136766b3 100644
--- a/app/Jobs/Common/CreateContact.php
+++ b/app/Jobs/Common/CreateContact.php
@@ -27,7 +27,7 @@ class CreateContact extends Job
      */
     public function handle()
     {
-        if (!empty($this->request->input('create_user'))) {
+        if ($this->request->get('create_user', 'false') === 'true') {
             $this->createUser();
         }
 
diff --git a/app/Jobs/Common/UpdateContact.php b/app/Jobs/Common/UpdateContact.php
index be513a71a..504228e7d 100644
--- a/app/Jobs/Common/UpdateContact.php
+++ b/app/Jobs/Common/UpdateContact.php
@@ -33,7 +33,7 @@ class UpdateContact extends Job
     {
         $this->authorize();
 
-        if (!empty($this->request->input('create_user'))) {
+        if ($this->request->get('create_user', 'false') === 'true') {
             $this->createUser();
         }
 

From 710bb7a293b3a3cbc3266c6ffb14faa4225b2e0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Wed, 4 Mar 2020 15:54:41 +0300
Subject: [PATCH 07/65] version update 2.0.3 to 2.0.4

---
 config/version.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/version.php b/config/version.php
index 8df22adf8..823f67304 100644
--- a/config/version.php
+++ b/config/version.php
@@ -10,15 +10,15 @@ return [
 
     'minor'     =>  '0',
 
-    'patch'     =>  '3',
+    'patch'     =>  '4',
 
     'build'     =>  '',
 
     'status'    =>  'Stable',
 
-    'date'      =>  '24-Feb-2020',
+    'date'      =>  '04-Mar-2020',
 
-    'time'      =>  '18:30',
+    'time'      =>  '14:30',
 
     'zone'      =>  'GMT +3',
 

From 907d348d8faf5ceed8896eb6eab862a931cce75c Mon Sep 17 00:00:00 2001
From: denisdulici <denisdulici@gmail.com>
Date: Wed, 4 Mar 2020 17:02:16 +0300
Subject: [PATCH 08/65] fixed tests

---
 tests/Feature/Sales/CustomersTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Feature/Sales/CustomersTest.php b/tests/Feature/Sales/CustomersTest.php
index 2f6740ad0..d76a21565 100644
--- a/tests/Feature/Sales/CustomersTest.php
+++ b/tests/Feature/Sales/CustomersTest.php
@@ -114,7 +114,7 @@ class CustomersTest extends FeatureTestCase
 		$password = $this->faker->password;
 
 		return $this->getRequest() + [
-			'create_user' => 1,
+			'create_user' => 'true',
 			'locale' => 'en-GB',
 			'password' => $password,
 			'password_confirmation' => $password,

From 8201af741b1ae6d2957fe6bfe4cdf7e56bd7abc2 Mon Sep 17 00:00:00 2001
From: denisdulici <denisdulici@gmail.com>
Date: Thu, 5 Mar 2020 17:22:07 +0300
Subject: [PATCH 09/65] generate bill number

---
 app/Http/Controllers/Purchases/Bills.php      |  4 ++-
 .../Purchase/IncreaseNextBillNumber.php       | 23 ++++++++++++++++
 app/Models/Purchase/Bill.php                  |  1 +
 app/Providers/Event.php                       |  1 +
 app/Traits/Purchases.php                      | 27 +++++++++++++++++++
 .../views/purchases/bills/create.blade.php    |  2 +-
 6 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 app/Listeners/Purchase/IncreaseNextBillNumber.php

diff --git a/app/Http/Controllers/Purchases/Bills.php b/app/Http/Controllers/Purchases/Bills.php
index 541351a85..e56108269 100644
--- a/app/Http/Controllers/Purchases/Bills.php
+++ b/app/Http/Controllers/Purchases/Bills.php
@@ -108,7 +108,9 @@ class Bills extends Controller
 
         $categories = Category::type('expense')->enabled()->orderBy('name')->pluck('name', 'id');
 
-        return view('purchases.bills.create', compact('vendors', 'currencies', 'currency', 'items', 'taxes', 'categories'));
+        $number = $this->getNextBillNumber();
+
+        return view('purchases.bills.create', compact('vendors', 'currencies', 'currency', 'items', 'taxes', 'categories', 'number'));
     }
 
     /**
diff --git a/app/Listeners/Purchase/IncreaseNextBillNumber.php b/app/Listeners/Purchase/IncreaseNextBillNumber.php
new file mode 100644
index 000000000..c05ee5b41
--- /dev/null
+++ b/app/Listeners/Purchase/IncreaseNextBillNumber.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Listeners\Purchase;
+
+use App\Events\Purchase\BillCreated as Event;
+use App\Traits\Purchases;
+
+class IncreaseNextBillNumber
+{
+    use Purchases;
+
+    /**
+     * Handle the event.
+     *
+     * @param  $event
+     * @return void
+     */
+    public function handle(Event $event)
+    {
+        // Update next bill number
+        $this->increaseNextBillNumber();
+    }
+}
diff --git a/app/Models/Purchase/Bill.php b/app/Models/Purchase/Bill.php
index 76f5a0223..931810c6d 100644
--- a/app/Models/Purchase/Bill.php
+++ b/app/Models/Purchase/Bill.php
@@ -99,5 +99,6 @@ class Bill extends DocumentModel
     public function onCloning($src, $child = null)
     {
         $this->status = 'draft';
+        $this->bill_number = $this->getNextBillNumber();
     }
 }
diff --git a/app/Providers/Event.php b/app/Providers/Event.php
index c8f04a232..42d2af107 100644
--- a/app/Providers/Event.php
+++ b/app/Providers/Event.php
@@ -25,6 +25,7 @@ class Event extends Provider
         ],
         'App\Events\Purchase\BillCreated' => [
             'App\Listeners\Purchase\CreateBillCreatedHistory',
+            'App\Listeners\Purchase\IncreaseNextBillNumber',
         ],
         'App\Events\Purchase\BillReceived' => [
             'App\Listeners\Purchase\MarkBillReceived',
diff --git a/app/Traits/Purchases.php b/app/Traits/Purchases.php
index beb1a0184..228ae3c7d 100644
--- a/app/Traits/Purchases.php
+++ b/app/Traits/Purchases.php
@@ -4,6 +4,33 @@ namespace App\Traits;
 
 trait Purchases
 {
+    /**
+     * Generate next bill number
+     *
+     * @return string
+     */
+    public function getNextBillNumber()
+    {
+        $prefix = setting('bill.number_prefix', 'BIL-');
+        $next = setting('bill.number_next', '1');
+        $digit = setting('bill.number_digit', '5');
+
+        $number = $prefix . str_pad($next, $digit, '0', STR_PAD_LEFT);
+
+        return $number;
+    }
+
+    /**
+     * Increase the next bill number
+     */
+    public function increaseNextBillNumber()
+    {
+        $next = setting('bill.number_next', 1) + 1;
+
+        setting(['bill.number_next' => $next]);
+        setting()->save();
+    }
+
     /**
      * Get a collection of bill statuses
      *
diff --git a/resources/views/purchases/bills/create.blade.php b/resources/views/purchases/bills/create.blade.php
index b9a630f14..9c62679a8 100644
--- a/resources/views/purchases/bills/create.blade.php
+++ b/resources/views/purchases/bills/create.blade.php
@@ -25,7 +25,7 @@
 
                     {{ Form::dateGroup('due_at', trans('bills.due_date'), 'calendar', ['id' => 'due_at', 'class' => 'form-control datepicker', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], request()->get('due_at', request()->get('billed_at', Date::now()->toDateString()))) }}
 
-                    {{ Form::textGroup('bill_number', trans('bills.bill_number'), 'file') }}
+                    {{ Form::textGroup('bill_number', trans('bills.bill_number'), 'file', ['required' => 'required'], $number) }}
 
                     {{ Form::textGroup('order_number', trans('bills.order_number'), 'shopping-cart',[]) }}
 

From c4ca77916c3455199d724a60d6af93d10ae876ab Mon Sep 17 00:00:00 2001
From: batuhanbas <b1atuhanb1as@gmail.com>
Date: Fri, 6 Mar 2020 12:28:21 +0300
Subject: [PATCH 10/65] Forgotten disabled attribute

---
 resources/views/partials/form/money_group.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/partials/form/money_group.blade.php b/resources/views/partials/form/money_group.blade.php
index ed0cdccf9..db111f114 100644
--- a/resources/views/partials/form/money_group.blade.php
+++ b/resources/views/partials/form/money_group.blade.php
@@ -16,7 +16,7 @@
         @endif
 
         @if (isset($attributes['disabled']))
-        :disabled="'{{ $attributes['disabled'] }}'"
+        :disabled="{{ $attributes['disabled'] }}"
         @endif
 
         @if (isset($attributes['masked']))

From 59fd259c1e9c3440e3d8b33f02afe526452848f5 Mon Sep 17 00:00:00 2001
From: denisdulici <denisdulici@gmail.com>
Date: Fri, 6 Mar 2020 16:24:17 +0300
Subject: [PATCH 11/65] styling

---
 .../Resources/views/show.blade.php            | 26 ++++--
 .../Resources/views/show.blade.php            | 91 ++++++++++---------
 2 files changed, 65 insertions(+), 52 deletions(-)

diff --git a/modules/OfflinePayments/Resources/views/show.blade.php b/modules/OfflinePayments/Resources/views/show.blade.php
index a8907ff48..316b3c3d4 100644
--- a/modules/OfflinePayments/Resources/views/show.blade.php
+++ b/modules/OfflinePayments/Resources/views/show.blade.php
@@ -1,16 +1,24 @@
-<h2>{{ $setting['name'] }}</h2>
+<div>
+    <div class="d-none">
+        @if (!empty($setting['name']))
+            <h2>{{ $setting['name'] }}</h2>
+        @endif
 
-@if ($setting['description'])
-    <div class="well well-sm">
-        {{ $setting['description'] }}
+        @if (!empty($setting['description']))
+            <div class="well well-sm">
+                {{ $setting['description'] }}
+            </div>
+        @endif
     </div>
-@endif
+    <br>
 
-<div class="buttons">
-    <div class="float-right">
-        <input type="button" value="{{ trans('offline-payments::general.confirm') }}" id="button-confirm" class="btn btn-success" data-loading-text="{{ trans('offline-payments::general.loading') }}" />
+    <div class="buttons">
+        <div class="pull-right">
+            <input type="button" value="{{ trans('offline-payments::general.confirm') }}" id="button-confirm" class="btn btn-success" data-loading-text="{{ trans('offline-payments::general.loading') }}" />
+        </div>
     </div>
 </div>
+
 <script type="text/javascript"><!--
     $('#button-confirm').on('click', function() {
         $.ajax({
@@ -37,4 +45,4 @@
             }
         });
     });
-    //--></script>
+//--></script>
diff --git a/modules/PaypalStandard/Resources/views/show.blade.php b/modules/PaypalStandard/Resources/views/show.blade.php
index bdd14657d..7248daf36 100644
--- a/modules/PaypalStandard/Resources/views/show.blade.php
+++ b/modules/PaypalStandard/Resources/views/show.blade.php
@@ -1,48 +1,53 @@
 <div>
-    <h2>{{ $setting['name'] }}</h2>
+    <div class="d-none">
+        @if (!empty($setting['name']))
+            <h2>{{ $setting['name'] }}</h2>
+        @endif
 
-    @if($setting['mode'] == 'sandbox')
-        <div class="alert alert-danger"><i class="fa fa-exclamation-circle"></i> {{ trans('paypal-standard::general.test_mode') }}</div>
-    @endif
+        @if ($setting['mode'] == 'sandbox')
+            <div class="alert alert-danger"><i class="fa fa-exclamation-circle"></i> {{ trans('paypal-standard::general.test_mode') }}</div>
+        @endif
 
-    <div class="well well-sm">
-        {{ trans('paypal-standard::general.description') }}
-    </div>
-
-    <form action="{{ $setting['action'] }}" method="post">
-        <input type="hidden" name="cmd" value="_cart" />
-        <input type="hidden" name="upload" value="1" />
-        <input type="hidden" name="business" value="{{ $setting['email'] }}" />
-        <?php $i = 1; ?>
-        @foreach ($invoice->items as $item)
-            <input type="hidden" name="item_name_{{ $i }}" value="{{ $item->name }}" />
-            <input type="hidden" name="amount_{{ $i }}" value="{{ $item->price }}" />
-            <input type="hidden" name="quantity_{{ $i }}" value="{{ $item->quantity }}" />
-            <?php $i++; ?>
-        @endforeach
-        <input type="hidden" name="currency_code" value="{{ $invoice->currency_code}}" />
-        <input type="hidden" name="first_name" value="{{ $invoice->first_name }}" />
-        <input type="hidden" name="last_name" value="{{ $invoice->last_name }}" />
-        <input type="hidden" name="address1" value="{{ $invoice->customer_address }}" />
-        <input type="hidden" name="address_override" value="0" />
-        <input type="hidden" name="email" value="{{ $invoice->customer_email }}" />
-        <input type="hidden" name="invoice" value="{{ $invoice->id . '-' . $invoice->customer_name }}" />
-        <input type="hidden" name="lc" value="{{ $setting['language'] }}" />
-        <input type="hidden" name="rm" value="2" />
-        <input type="hidden" name="no_note" value="1" />
-        <input type="hidden" name="no_shipping" value="1" />
-        <input type="hidden" name="charset" value="utf-8" />
-        <input type="hidden" name="return" value="{{ route('portal.invoices.paypal-standard.return', $invoice->id) }}" />
-        <input type="hidden" name="notify_url" value="{{ route('portal.invoices.paypal-standard.complete', $invoice->id) }}" />
-        <input type="hidden" name="cancel_return" value="{{ $invoice_url }}" />
-        <input type="hidden" name="paymentaction" value="{{ $setting['transaction'] }}" />
-        <input type="hidden" name="custom" value="{{ $invoice->id }}" />
-        <input type="hidden" name="bn" value="Akaunting_2.0_WPS" />
-
-        <div class="buttons">
-            <div class="float-right">
-                <input type="submit" value="{{ trans('general.confirm') }}" class="btn btn-success" />
-            </div>
+        <div class="well well-sm">
+            {{ trans('paypal-standard::general.description') }}
         </div>
-    </form>
+    </div>
+    <br>
+
+    <div class="buttons">
+        <div class="pull-right">
+            <form action="{{ $setting['action'] }}" method="post">
+                <input type="hidden" name="cmd" value="_cart" />
+                <input type="hidden" name="upload" value="1" />
+                <input type="hidden" name="business" value="{{ $setting['email'] }}" />
+                <?php $i = 1; ?>
+                @foreach ($invoice->items as $item)
+                    <input type="hidden" name="item_name_{{ $i }}" value="{{ $item->name }}" />
+                    <input type="hidden" name="amount_{{ $i }}" value="{{ $item->price }}" />
+                    <input type="hidden" name="quantity_{{ $i }}" value="{{ $item->quantity }}" />
+                    <?php $i++; ?>
+                @endforeach
+                <input type="hidden" name="currency_code" value="{{ $invoice->currency_code}}" />
+                <input type="hidden" name="first_name" value="{{ $invoice->first_name }}" />
+                <input type="hidden" name="last_name" value="{{ $invoice->last_name }}" />
+                <input type="hidden" name="address1" value="{{ $invoice->customer_address }}" />
+                <input type="hidden" name="address_override" value="0" />
+                <input type="hidden" name="email" value="{{ $invoice->customer_email }}" />
+                <input type="hidden" name="invoice" value="{{ $invoice->id . '-' . $invoice->customer_name }}" />
+                <input type="hidden" name="lc" value="{{ $setting['language'] }}" />
+                <input type="hidden" name="rm" value="2" />
+                <input type="hidden" name="no_note" value="1" />
+                <input type="hidden" name="no_shipping" value="1" />
+                <input type="hidden" name="charset" value="utf-8" />
+                <input type="hidden" name="return" value="{{ route('portal.invoices.paypal-standard.return', $invoice->id) }}" />
+                <input type="hidden" name="notify_url" value="{{ route('portal.invoices.paypal-standard.complete', $invoice->id) }}" />
+                <input type="hidden" name="cancel_return" value="{{ $invoice_url }}" />
+                <input type="hidden" name="paymentaction" value="{{ $setting['transaction'] }}" />
+                <input type="hidden" name="custom" value="{{ $invoice->id }}" />
+                <input type="hidden" name="bn" value="Akaunting_2.0_WPS" />
+
+                <input type="submit" value="{{ trans('general.confirm') }}" class="btn btn-success" />
+            </form>
+        </div>
+    </div>
 </div>

From 080c6616c27973ebf8413dfdec6b5e7e3a434842 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Fri, 6 Mar 2020 17:46:37 +0300
Subject: [PATCH 12/65] Tax add new create page stylee..

---
 resources/views/modals/taxes/create.blade.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/resources/views/modals/taxes/create.blade.php b/resources/views/modals/taxes/create.blade.php
index f753337d2..1ef955c1b 100644
--- a/resources/views/modals/taxes/create.blade.php
+++ b/resources/views/modals/taxes/create.blade.php
@@ -3,7 +3,7 @@
     '@submit.prevent' => 'onSubmit',
     '@keydown' => 'form.errors.clear($event.target.name)',
     'role' => 'form',
-    'class' => 'form-loading-button m--3',
+    'class' => 'form-loading-button',
     'route' => 'taxes.store',
     'novalidate' => true
 ]) !!}
@@ -12,8 +12,7 @@
 
         {{ Form::textGroup('rate', trans('taxes.rate'), 'percent') }}
 
-        {{ Form::selectGroup('type', trans_choice('general.types', 1), 'bars', $types, 'normal') }}
-
-        {!! Form::hidden('enabled', '1', []) !!}
+        {!! Form::hidden('type', 'normal') !!}
+        {!! Form::hidden('enabled', '1') !!}
     </div>
 {!! Form::close() !!}

From 67f35aa9a21024e25b25aad4e756ab85935f7395 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Fri, 6 Mar 2020 18:04:23 +0300
Subject: [PATCH 13/65] selectbox add new new style

---
 .../assets/js/components/AkauntingSelect.vue  | 67 +++++++++++++++++--
 .../form/multi_select_add_new_group.blade.php |  1 +
 .../form/select_add_new_group.blade.php       |  5 +-
 .../form/select_group_add_new_group.blade.php |  5 +-
 4 files changed, 69 insertions(+), 9 deletions(-)

diff --git a/resources/assets/js/components/AkauntingSelect.vue b/resources/assets/js/components/AkauntingSelect.vue
index 865b6b2dc..23f43665b 100644
--- a/resources/assets/js/components/AkauntingSelect.vue
+++ b/resources/assets/js/components/AkauntingSelect.vue
@@ -55,6 +55,8 @@
                :key="value"
                :label="label"
                :value="value">
+                <span class="float-left">{{ label }}</span>
+                <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
             </el-option>
 
             <el-option-group
@@ -67,6 +69,8 @@
                     :key="value"
                     :label="label"
                     :value="value">
+                    <span class="float-left">{{ label }}</span>
+                    <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
                 </el-option>
             </el-option-group>
 
@@ -124,6 +128,8 @@
                :key="value"
                :label="label"
                :value="value">
+                <span class="float-left">{{ label }}</span>
+                <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
             </el-option>
 
             <el-option-group
@@ -136,6 +142,8 @@
                     :key="value"
                     :label="label"
                     :value="value">
+                    <span class="float-left">{{ label }}</span>
+                    <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
                 </el-option>
             </el-option-group>
 
@@ -193,6 +201,8 @@
                :key="value"
                :label="label"
                :value="value">
+                <span class="float-left">{{ label }}</span>
+                <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
             </el-option>
 
             <el-option-group
@@ -205,6 +215,8 @@
                     :key="value"
                     :label="label"
                     :value="value">
+                    <span class="float-left">{{ label }}</span>
+                    <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
                 </el-option>
             </el-option-group>
 
@@ -262,6 +274,8 @@
                :key="value"
                :label="label"
                :value="value">
+                <span class="float-left">{{ label }}</span>
+                <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
             </el-option>
 
             <el-option-group
@@ -274,6 +288,8 @@
                     :key="value"
                     :label="label"
                     :value="value">
+                    <span class="float-left">{{ label }}</span>
+                    <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
                 </el-option>
             </el-option-group>
 
@@ -331,6 +347,8 @@
                :key="value"
                :label="label"
                :value="value">
+                <span class="float-left">{{ label }}</span>
+                <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
             </el-option>
 
             <el-option-group
@@ -343,6 +361,8 @@
                     :key="value"
                     :label="label"
                     :value="value">
+                    <span class="float-left">{{ label }}</span>
+                    <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
                 </el-option>
             </el-option-group>
 
@@ -356,7 +376,9 @@
             </el-option>
         </el-select>
 
-        <component v-bind:is="add_new_html" @submit="onSubmit"></component>
+        <component v-bind:is="add_new_html" @submit="onSubmit" @cancel="onCancel"></component>
+
+        <span slot="infoBlock" class="badge badge-success badge-resize float-right" v-if="new_options[real_model]">{{ new_text }}</span>
 
         <select :name="name" v-model="real_model" class="d-none">
             <option v-for="(label, value) in selectOptions" :value="value">{{ label }}</option>
@@ -447,6 +469,7 @@ export default {
                     path: null,
                     type: 'modal', // modal, inline
                     field: 'name',
+                    new_text: 'New',
                     buttons: {}
                 };
             },
@@ -493,15 +516,28 @@ export default {
 
     data() {
         return {
-            add_new: this.addNew,
+            add_new: {
+                text: this.addNew.text,
+                show: false,
+                path: this.addNew.path,
+                type: this.addNew.type, // modal, inline
+                field: this.addNew.name,
+                buttons: this.addNew.buttons
+            },
             add_new_text: this.addNew.text,
+            new_text: this.addNew.new_text,
             selectOptions: this.options,
             real_model: this.model,
             add_new_html: '',
             form: {},
+            new_options: false,
         }
     },
 
+    created() {
+        this.new_options = {};
+    },
+
     mounted() {
         this.real_model = this.value;
 
@@ -534,14 +570,14 @@ export default {
 
             axios.get(this.add_new.path)
             .then(response => {
-                add_new.status = true;
+                add_new.show = true;
                 add_new.html = response.data.html;
 
                 this.$children[0].$children[0].visible = false;
 
                 this.add_new_html = Vue.component('add-new-component', function (resolve, reject) {
                     resolve({
-                        template: '<div><akaunting-modal-add-new :show="add_new.status" @submit="onSubmit" @cancel="add_new.status = false" :buttons="add_new.buttons" :title="add_new.text" :is_component=true :message="add_new.html"></akaunting-modal-add-new></div>',
+                        template: '<div><akaunting-modal-add-new :show="add_new.show" @submit="onSubmit" @cancel="onCancel" :buttons="add_new.buttons" :title="add_new.text" :is_component=true :message="add_new.html"></akaunting-modal-add-new></div>',
 
                         components: {
                             AkauntingModalAddNew,
@@ -562,6 +598,10 @@ export default {
                         methods: {
                             onSubmit(event) {
                                 this.$emit('submit', event);
+                            },
+
+                            onCancel(event) {
+                                this.$emit('cancel', event);
                             }
                         }
                     })
@@ -584,11 +624,15 @@ export default {
 
                 if (response.data.success) {
                     this.selectOptions[response.data.data.id] = response.data.data['name'];
+                    this.new_options[response.data.data.id] = response.data.data.id;
                     this.real_model = response.data.data.id.toString();
 
                     this.change();
 
-                    //this.add_new.status = false;
+                    this.add_new.show = false;
+
+                    this.add_new.html = '';
+                    this.add_new_html = null;
                 }
             })
             .catch(error => {
@@ -600,6 +644,12 @@ export default {
             });
         },
 
+        onCancel() {
+            this.add_new.show = false;
+            this.add_new.html = null;
+            this.add_new_html = null;
+        },
+
         addModal() {
 
         },
@@ -667,4 +717,11 @@ export default {
     .el-select__footer div span {
         margin-left: 5px;
     }
+
+    .badge-resize {
+        float: right;
+        margin-top: -32px;
+        margin-right: 35px;
+        position: relative;
+    }
 </style>
diff --git a/resources/views/partials/form/multi_select_add_new_group.blade.php b/resources/views/partials/form/multi_select_add_new_group.blade.php
index ccdd36aab..736668ac1 100644
--- a/resources/views/partials/form/multi_select_add_new_group.blade.php
+++ b/resources/views/partials/form/multi_select_add_new_group.blade.php
@@ -31,6 +31,7 @@
             'path' => isset($attributes['path']) ? $attributes['path']: false,
             'type' => isset($attributes['type']) ? $attributes['type'] : 'modal',
             'field' => isset($attributes['field']) ? $attributes['field'] : 'name',
+            'new_text' => trans('modules.new'),
             'buttons' => [
                 'cancel' => [
                     'text' => trans('general.cancel'),
diff --git a/resources/views/partials/form/select_add_new_group.blade.php b/resources/views/partials/form/select_add_new_group.blade.php
index aaa5c50c5..adea5052f 100644
--- a/resources/views/partials/form/select_add_new_group.blade.php
+++ b/resources/views/partials/form/select_add_new_group.blade.php
@@ -6,7 +6,7 @@
         @if (!empty($attributes['v-error']))
         :form-classes="[{'has-error': {{ $attributes['v-error'] }} }]"
         @else
-        :form-classes="[{'has-error': form.errors.get('{{ $name }}') }]"
+        :form-classes="[{'has-error': form.errors.has('{{ $name }}') }]"
         @endif
 
         icon="{{ $icon }}"
@@ -29,6 +29,7 @@
             'path' => isset($attributes['path']) ? $attributes['path']: false,
             'type' => isset($attributes['type']) ? $attributes['type'] : 'modal',
             'field' => isset($attributes['field']) ? $attributes['field'] : 'name',
+            'new_text' => trans('modules.new'),
             'buttons' => [
                 'cancel' => [
                     'text' => trans('general.cancel'),
@@ -46,7 +47,7 @@
         @elseif (!empty($attributes['data-field']))
         @interface="{{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
         @else
-        @interface="form.{{ $name }} = $event"
+        @interface="form.{{ $name }} = $event; form.errors.clear('{{ $name }}');"
         @endif
 
         @if (!empty($attributes['change']))
diff --git a/resources/views/partials/form/select_group_add_new_group.blade.php b/resources/views/partials/form/select_group_add_new_group.blade.php
index 1f9565354..b98c773b8 100644
--- a/resources/views/partials/form/select_group_add_new_group.blade.php
+++ b/resources/views/partials/form/select_group_add_new_group.blade.php
@@ -6,7 +6,7 @@
         @if (!empty($attributes['v-error']))
         :form-classes="[{'has-error': {{ $attributes['v-error'] }} }]"
         @else
-        :form-classes="[{'has-error': form.errors.get('{{ $name }}') }]"
+        :form-classes="[{'has-error': form.errors.has('{{ $name }}') }]"
         @endif
 
         icon="{{ $icon }}"
@@ -29,6 +29,7 @@
             'path' => isset($attributes['path']) ? $attributes['path']: false,
             'type' => isset($attributes['type']) ? $attributes['type'] : 'modal',
             'field' => isset($attributes['field']) ? $attributes['field'] : 'name',
+            'new_text' => trans('modules.new'),
             'buttons' => [
                 'cancel' => [
                     'text' => trans('general.cancel'),
@@ -48,7 +49,7 @@
         @elseif (!empty($attributes['data-field']))
         @interface="{{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
         @else
-        @interface="form.{{ $name }} = $event"
+        @interface="form.{{ $name }} = $event; form.errors.clear('{{ $name }}');"
         @endif
 
         @if (!empty($attributes['change']))

From 3f80aa18f3929cf9fc761122c73163feb3133f02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Sat, 7 Mar 2020 13:14:16 +0300
Subject: [PATCH 14/65] Modal currency create form issue solved.

---
 resources/views/modals/currencies/create.blade.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/resources/views/modals/currencies/create.blade.php b/resources/views/modals/currencies/create.blade.php
index 1565aa156..d7ca311ee 100644
--- a/resources/views/modals/currencies/create.blade.php
+++ b/resources/views/modals/currencies/create.blade.php
@@ -14,7 +14,8 @@
 
         {{ Form::textGroup('rate', trans('currencies.rate'), 'sliders-h', ['@input' => 'onChangeRate', 'required' => 'required']) }}
 
-        {!! Form::hidden('enabled', '1', []) !!}
-        {!! Form::hidden('default_currency', 'false', []) !!}
+        {!! Form::hidden('enabled', 1) !!}
+        {!! Form::hidden('symbol_first', 1) !!}
+        {!! Form::hidden('default_currency', 0) !!}
     </div>
 {!! Form::close() !!}

From 477c9cb3f41acc3b412198746e7915216f3676d0 Mon Sep 17 00:00:00 2001
From: denisdulici <denisdulici@gmail.com>
Date: Sat, 7 Mar 2020 13:19:16 +0300
Subject: [PATCH 15/65] added env to setting

---
 config/setting.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/config/setting.php b/config/setting.php
index e18a544bb..ae4eb5f13 100644
--- a/config/setting.php
+++ b/config/setting.php
@@ -10,7 +10,7 @@ return [
     | Auto-save every time the application shuts down
     |
     */
-	'auto_save'			=> false,
+	'auto_save'			=> env('SETTING_AUTO_SAVE', false),
 
     /*
     |--------------------------------------------------------------------------
@@ -22,10 +22,10 @@ return [
     |
     */
     'cache' => [
-        'enabled'       => true,
-        'key'           => 'setting',
-        'ttl'           => 21600,
-        'auto_clear'    => true,
+        'enabled'       => env('SETTING_CACHE_ENABLED', true),
+        'key'           => env('SETTING_CACHE_KEY', 'setting'),
+        'ttl'           => env('SETTING_CACHE_TTL', 21600),
+        'auto_clear'    => env('SETTING_CACHE_AUTO_CLEAR', true),
     ],
 
 	/*
@@ -38,7 +38,7 @@ return [
     | Supported: "database", "json"
     |
     */
-	'driver'			=> 'database',
+	'driver'			=> env('SETTING_DRIVER', 'database'),
 
 	/*
     |--------------------------------------------------------------------------
@@ -50,10 +50,10 @@ return [
     |
     */
 	'database' => [
-		'connection'    => null,
-		'table'         => 'settings',
-		'key'           => 'key',
-		'value'         => 'value',
+		'connection'    => env('SETTING_DATABASE_CONNECTION', null),
+		'table'         => env('SETTING_DATABASE_TABLE', 'settings'),
+		'key'           => env('SETTING_DATABASE_KEY', 'key'),
+		'value'         => env('SETTING_DATABASE_VALUE', 'value'),
 	],
 
 	/*
@@ -65,7 +65,7 @@ return [
     |
     */
 	'json' => [
-		'path'          => storage_path() . '/settings.json',
+		'path'          => env('SETTING_JSON_PATH', storage_path('settings.json')),
 	],
 
 	/*

From fd25e31d96b82f1d9070ff64b891053474cd9b10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Sat, 7 Mar 2020 13:25:35 +0300
Subject: [PATCH 16/65] Selectbox add new and validation message.

---
 .../assets/js/components/AkauntingSelect.vue  | 39 ++++++++++++++++++-
 .../js/components/AkauntingSelectRemote.vue   | 34 +++++++++++++++-
 .../partials/form/select_group.blade.php      |  4 +-
 3 files changed, 73 insertions(+), 4 deletions(-)

diff --git a/resources/assets/js/components/AkauntingSelect.vue b/resources/assets/js/components/AkauntingSelect.vue
index 23f43665b..15c0aea31 100644
--- a/resources/assets/js/components/AkauntingSelect.vue
+++ b/resources/assets/js/components/AkauntingSelect.vue
@@ -393,6 +393,7 @@ import { Select, Option, OptionGroup, ColorPicker } from 'element-ui';
 
 import AkauntingModalAddNew from './AkauntingModalAddNew';
 import AkauntingModal from './AkauntingModal';
+import AkauntingMoney from './AkauntingMoney';
 import AkauntingRadioGroup from './forms/AkauntingRadioGroup';
 import AkauntingSelect from './AkauntingSelect';
 import AkauntingDate from './AkauntingDate';
@@ -412,6 +413,7 @@ export default {
         AkauntingRadioGroup,
         AkauntingSelect,
         AkauntingModal,
+        AkauntingMoney,
         AkauntingDate,
         AkauntingRecurring,
     },
@@ -584,6 +586,7 @@ export default {
                             AkauntingRadioGroup,
                             AkauntingSelect,
                             AkauntingModal,
+                            AkauntingMoney,
                             AkauntingDate,
                             AkauntingRecurring,
                             [ColorPicker.name]: ColorPicker,
@@ -618,7 +621,41 @@ export default {
         onSubmit(event) {
             this.form = event;
 
-            axios.post(this.form.action, this.form.data())
+            this.loading = true;
+
+            let data = this.form.data();
+
+            FormData.prototype.appendRecursive = function(data, wrapper = null) {  
+                for(var name in data) {
+                    if (wrapper) {
+                        if ((typeof data[name] == 'object' || data[name].constructor === Array) && ((data[name] instanceof File != true ) && (data[name] instanceof Blob != true))) {
+                            this.appendRecursive(data[name], wrapper + '[' + name + ']');
+                        } else {
+                            this.append(wrapper + '[' + name + ']', data[name]);
+                        }
+                    } else {
+                        if ((typeof data[name] == 'object' || data[name].constructor === Array) && ((data[name] instanceof File != true ) && (data[name] instanceof Blob != true))) {
+                            this.appendRecursive(data[name], name);
+                        } else {
+                            this.append(name, data[name]);
+                        }
+                    }
+                }
+            };
+
+            let form_data = new FormData();
+            form_data.appendRecursive(data);
+
+            window.axios({
+                method: this.form.method,
+                url: this.form.action,
+                data: form_data,
+                headers: {
+                    'X-CSRF-TOKEN': window.Laravel.csrfToken,
+                    'X-Requested-With': 'XMLHttpRequest',
+                    'Content-Type': 'multipart/form-data'
+                }
+            })
             .then(response => {
                 this.form.loading = false;
 
diff --git a/resources/assets/js/components/AkauntingSelectRemote.vue b/resources/assets/js/components/AkauntingSelectRemote.vue
index 08a23d395..71ce64f14 100644
--- a/resources/assets/js/components/AkauntingSelectRemote.vue
+++ b/resources/assets/js/components/AkauntingSelectRemote.vue
@@ -681,7 +681,39 @@ export default {
         onSubmit(event) {
             this.form = event;
 
-            axios.post(this.form.action, this.form.data())
+            let data = this.form.data();
+
+            FormData.prototype.appendRecursive = function(data, wrapper = null) {  
+                for(var name in data) {
+                    if (wrapper) {
+                        if ((typeof data[name] == 'object' || data[name].constructor === Array) && ((data[name] instanceof File != true ) && (data[name] instanceof Blob != true))) {
+                            this.appendRecursive(data[name], wrapper + '[' + name + ']');
+                        } else {
+                            this.append(wrapper + '[' + name + ']', data[name]);
+                        }
+                    } else {
+                        if ((typeof data[name] == 'object' || data[name].constructor === Array) && ((data[name] instanceof File != true ) && (data[name] instanceof Blob != true))) {
+                            this.appendRecursive(data[name], name);
+                        } else {
+                            this.append(name, data[name]);
+                        }
+                    }
+                }
+            };
+
+            let form_data = new FormData();
+            form_data.appendRecursive(data);
+
+            window.axios({
+                method: this.form.method,
+                url: this.form.action,
+                data: form_data,
+                headers: {
+                    'X-CSRF-TOKEN': window.Laravel.csrfToken,
+                    'X-Requested-With': 'XMLHttpRequest',
+                    'Content-Type': 'multipart/form-data'
+                }
+            })
             .then(response => {
                 this.form.loading = false;
 
diff --git a/resources/views/partials/form/select_group.blade.php b/resources/views/partials/form/select_group.blade.php
index 6744366ce..50b40e6e0 100644
--- a/resources/views/partials/form/select_group.blade.php
+++ b/resources/views/partials/form/select_group.blade.php
@@ -6,7 +6,7 @@
         @if (!empty($attributes['v-error']))
         :form-classes="[{'has-error': {{ $attributes['v-error'] }} }]"
         @else
-        :form-classes="[{'has-error': form.errors.get('{{ $name }}') }]"
+        :form-classes="[{'has-error': form.errors.has('{{ $name }}') }]"
         @endif
 
         icon="{{ $icon }}"
@@ -28,7 +28,7 @@
         @elseif (!empty($attributes['data-field']))
         @interface="{{ 'form.' . $attributes['data-field'] . '.' . $name . ' = $event' }}"
         @else
-        @interface="form.{{ $name }} = $event"
+        @interface="form.errors.clear('{{ $name }}'); form.{{ $name }} = $event;"
         @endif
 
         @if (!empty($attributes['change']))

From c0d97176e5eafa7915be151bdb6150102a0fea0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Sat, 7 Mar 2020 13:30:55 +0300
Subject: [PATCH 17/65] file updates

---
 resources/assets/js/views/auth/forgot.js | 4 ----
 resources/assets/js/views/auth/login.js  | 4 ----
 webpack.mix.js                           | 1 -
 3 files changed, 9 deletions(-)

diff --git a/resources/assets/js/views/auth/forgot.js b/resources/assets/js/views/auth/forgot.js
index 7455260b6..6f264bbf3 100644
--- a/resources/assets/js/views/auth/forgot.js
+++ b/resources/assets/js/views/auth/forgot.js
@@ -19,11 +19,7 @@ const app = new Vue({
         }
     },
 
-    mounted() {
-    },
-
     methods: {
-
         onSubmit() {
             this.form.submit();
         },
diff --git a/resources/assets/js/views/auth/login.js b/resources/assets/js/views/auth/login.js
index 2780368e4..9a040a1f2 100644
--- a/resources/assets/js/views/auth/login.js
+++ b/resources/assets/js/views/auth/login.js
@@ -19,11 +19,7 @@ const app = new Vue({
         }
     },
 
-    mounted() {
-    },
-
     methods: {
-
         onSubmit() {
             this.form.submit();
         },
diff --git a/webpack.mix.js b/webpack.mix.js
index 9aadba08d..0f0f22db4 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -66,7 +66,6 @@ mix
     .js('resources/assets/js/views/settings/settings.js', 'public/js/settings')
     .js('resources/assets/js/views/settings/taxes.js', 'public/js/settings')
 
-
     // Wizard
     .js('resources/assets/js/views/wizard/company.js', 'public/js/wizard')
     .js('resources/assets/js/views/wizard/currencies.js', 'public/js/wizard')

From 3fcb4327a8dbde506811c2145c4316c9230c4d1f Mon Sep 17 00:00:00 2001
From: denisdulici <denisdulici@gmail.com>
Date: Sat, 7 Mar 2020 15:59:15 +0300
Subject: [PATCH 18/65] updated translations

---
 resources/lang/ar-SA/auth.php                 |  2 +-
 resources/lang/ar-SA/bills.php                |  8 +-
 resources/lang/ar-SA/bulk_actions.php         |  8 +-
 resources/lang/ar-SA/currencies.php           |  2 +-
 resources/lang/ar-SA/customers.php            |  2 +-
 resources/lang/ar-SA/dashboards.php           |  6 +-
 resources/lang/ar-SA/demo.php                 |  4 +-
 resources/lang/ar-SA/email_templates.php      | 16 ++--
 resources/lang/ar-SA/general.php              | 28 +++----
 resources/lang/ar-SA/header.php               |  2 +-
 resources/lang/ar-SA/invoices.php             |  6 +-
 resources/lang/ar-SA/maintenance.php          |  2 +-
 resources/lang/ar-SA/messages.php             |  4 +-
 resources/lang/ar-SA/modules.php              | 12 +--
 resources/lang/ar-SA/reconciliations.php      |  2 +-
 resources/lang/ar-SA/settings.php             |  8 +-
 resources/lang/ar-SA/validation.php           |  8 +-
 resources/lang/ar-SA/widgets.php              |  2 +-
 resources/lang/hi-IN/auth.php                 |  1 +
 resources/lang/hi-IN/bills.php                |  2 +
 resources/lang/hi-IN/bulk_actions.php         | 16 ++--
 resources/lang/hi-IN/companies.php            |  5 +-
 resources/lang/hi-IN/customers.php            |  2 +-
 resources/lang/hi-IN/dashboards.php           | 11 +++
 resources/lang/hi-IN/demo.php                 | 35 +++++++--
 resources/lang/hi-IN/errors.php               | 29 ++++---
 resources/lang/hi-IN/general.php              | 31 +++++++-
 resources/lang/hi-IN/invoices.php             |  9 ++-
 resources/lang/hi-IN/maintenance.php          |  8 +-
 resources/lang/hi-IN/messages.php             |  3 +-
 resources/lang/hi-IN/modules.php              |  8 +-
 resources/lang/hi-IN/pagination.php           |  6 +-
 resources/lang/hi-IN/reports.php              |  2 +-
 resources/lang/hi-IN/settings.php             |  4 +
 .../lang/hi-IN/{dashboard.php => widgets.php} |  6 +-
 resources/lang/nb-NO/auth.php                 |  6 +-
 resources/lang/nb-NO/bills.php                |  4 +-
 resources/lang/nb-NO/bulk_actions.php         | 19 +++++
 resources/lang/nb-NO/companies.php            |  7 +-
 resources/lang/nb-NO/customers.php            |  8 +-
 resources/lang/nb-NO/dashboards.php           | 11 +++
 resources/lang/nb-NO/demo.php                 | 35 +++++++--
 resources/lang/nb-NO/email_templates.php      | 50 ++++++++++++
 resources/lang/nb-NO/errors.php               | 26 ++++---
 resources/lang/nb-NO/general.php              | 63 ++++++++++++++-
 resources/lang/nb-NO/header.php               |  2 +-
 resources/lang/nb-NO/invoices.php             | 18 ++---
 resources/lang/nb-NO/items.php                | 10 ---
 resources/lang/nb-NO/maintenance.php          | 11 +++
 resources/lang/nb-NO/messages.php             |  5 +-
 resources/lang/nb-NO/modules.php              | 49 ++++++------
 resources/lang/nb-NO/pagination.php           |  7 +-
 resources/lang/nb-NO/reconciliations.php      |  2 +-
 resources/lang/nb-NO/reports.php              | 10 +--
 resources/lang/nb-NO/settings.php             | 76 ++++++++++++-------
 resources/lang/nb-NO/taxes.php                |  2 +-
 resources/lang/nb-NO/validation.php           | 13 ++--
 .../lang/nb-NO/{dashboard.php => widgets.php} | 19 +++--
 resources/lang/tr-TR/email_templates.php      |  2 +-
 59 files changed, 504 insertions(+), 251 deletions(-)
 create mode 100644 resources/lang/hi-IN/dashboards.php
 rename resources/lang/hi-IN/{dashboard.php => widgets.php} (87%)
 create mode 100644 resources/lang/nb-NO/bulk_actions.php
 create mode 100644 resources/lang/nb-NO/dashboards.php
 create mode 100644 resources/lang/nb-NO/email_templates.php
 create mode 100644 resources/lang/nb-NO/maintenance.php
 rename resources/lang/nb-NO/{dashboard.php => widgets.php} (50%)

diff --git a/resources/lang/ar-SA/auth.php b/resources/lang/ar-SA/auth.php
index 71bb1c1b9..72d49a2b1 100644
--- a/resources/lang/ar-SA/auth.php
+++ b/resources/lang/ar-SA/auth.php
@@ -33,7 +33,7 @@ return [
     'throttle'              => 'عدد كبير جداً من محاولات تسجيل الدخول. يرجى إعادة المحاولة خلال :seconds ثواني.',
 
     'notification' => [
-        'message_1'     => 'تم إرسال هذه الرسالة لإبلاغك بوجود طلب إعادة كلمة المرور على الحساب الخاص بك.',
+        'message_1'     => 'تم إرسال هذه الرسالة لإبلاغك بوجود طلب إعادة تعيين كلمة المرور على الحساب الخاص بك.',
         'message_2'     => 'لا داعي لاتخاذ أي إجراء إذا لم تقم بطلب إعادة كلمة المرور.',
         'button'        => 'إعادة تعيين كلمة المرور',
     ],
diff --git a/resources/lang/ar-SA/bills.php b/resources/lang/ar-SA/bills.php
index 2b1712e08..c323f3930 100644
--- a/resources/lang/ar-SA/bills.php
+++ b/resources/lang/ar-SA/bills.php
@@ -22,8 +22,8 @@ return [
     'add_discount'          => 'إضافة خصم',
     'discount_desc'         => 'من المجموع الجزئي',
 
-    'payment_due'           => 'استحقاق الدفع',
-    'amount_due'            => 'استحقاق المبلغ',
+    'payment_due'           => 'الدفع المستحق',
+    'amount_due'            => 'المبلغ المستحق',
     'paid'                  => 'مدفوع',
     'histories'             => 'سجلات',
     'payments'              => 'المدفوعات',
@@ -46,12 +46,12 @@ return [
 
     'messages' => [
         'received'          => 'تم تحويل فاتورة الشراء إلى فاتورة مستلمة بنجاح!',
-        'draft'             => 'هذة فاتورة شراء عبارة عن <b> مسودة </b> و سوف يتم تحويلها الى مخطط بعد ان يتم استحقاقها.',
+        'draft'             => 'هذة فاتورة شراء عبارة عن <b> مسودة </b> و سوف يتم اظهارها بالنظام بعد ان يتم استحقاقها.',
 
         'status' => [
             'created'       => 'إضافة في: تاريخ',
             'receive' => [
-                'draft'     => 'عدم الإرسال',
+                'draft'     => 'لم يتم ارسالها',
                 'received'  => 'وردت في: تاريخ',
             ],
             'paid' => [
diff --git a/resources/lang/ar-SA/bulk_actions.php b/resources/lang/ar-SA/bulk_actions.php
index 284e552aa..c6f6866ee 100644
--- a/resources/lang/ar-SA/bulk_actions.php
+++ b/resources/lang/ar-SA/bulk_actions.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'bulk_actions'     => 'العمل بالجملة|الاعمال بالجملة',
+    'bulk_actions'     => 'الإجراء الجماعي - الإجراءات الجماعية',
     'selected'         => 'مُحدد',
 
     'message' => [
@@ -11,9 +11,9 @@ return [
         'export'        => 'هل أنت متأكد من<b/> تصدير<b> السجلات المحددة؟',
         'enable'        => 'هل أنت متأكد من<b/> تفعيل<b> السجلات المحددة؟',
         'disable'       => 'هل أنت متأكد من <b/>تعطيل<b> السجلات المحددة؟',
-        'paid'          => 'هل تريد بالتأكيد وضع علامة على الفاتورة المحددة على أنها </b>مدفوعة<b> ؟',
-        'sent'          => 'هل تريد بالتأكيد وضع علامة على الفاتورة المحددة على أنها <b/>مرسلة<b>؟',
-        'received'      => 'هل تريد بالتأكيد وضع علامة على الفاتورة المحددة على أنها <b/>مستلمة<b>؟',
+        'paid'          => 'هل تريد وضع علامة على الفاتورة المحددة على أنها </b>مدفوعة<b> ؟',
+        'sent'          => 'هل تريد وضع علامة على الفاتورة المحددة على أنها <b/>تم أرسالها<b>؟',
+        'received'      => 'هل تريد وضع علامة على الفاتورة المحددة على أنها <b/>تم استلامها<b>؟',
     ],
 
 ];
diff --git a/resources/lang/ar-SA/currencies.php b/resources/lang/ar-SA/currencies.php
index 4e26bef4b..b2f583003 100644
--- a/resources/lang/ar-SA/currencies.php
+++ b/resources/lang/ar-SA/currencies.php
@@ -3,7 +3,7 @@
 return [
 
     'code'                  => 'كود',
-    'rate'                  => 'القيمة',
+    'rate'                  => 'المعدل',
     'default'               => 'العملة الافتراضية',
     'decimal_mark'          => 'علامة عشرية',
     'thousands_separator'   => 'فاصل الآلاف',
diff --git a/resources/lang/ar-SA/customers.php b/resources/lang/ar-SA/customers.php
index 1499d232c..d16250229 100644
--- a/resources/lang/ar-SA/customers.php
+++ b/resources/lang/ar-SA/customers.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'can_login'             => 'يستطيع تسجيل الدخول؟',
+    'can_login'             => 'هل يمكنك الدخول؟',
     'user_created'          => 'تم إنشاء المستخدم',
 
     'error' => [
diff --git a/resources/lang/ar-SA/dashboards.php b/resources/lang/ar-SA/dashboards.php
index 9a7879cd6..74d42f70f 100644
--- a/resources/lang/ar-SA/dashboards.php
+++ b/resources/lang/ar-SA/dashboards.php
@@ -3,9 +3,9 @@
 return [
 
     'error' => [
-        'not_user_dashboard'    => 'خطأ: غير مسموح لك بتغيير لوحة القيادة هذه!',
-        'delete_last'           => 'خطأ: لا يمكن حذف لوحة القيادة الأخيرة. من فضلك ، قم بإنشاء واحدة جديدة أولا!',
-        'disable_last'          => 'خطأ: لا يمكن تعطيل لوحة القيادة الأخيرة. من فضلك ، قم بإنشاء واحدة جديدة أولا!',
+        'not_user_dashboard'    => 'خطأ: غير مسموح لك بتغيير لوحة المعلومات هذه!',
+        'delete_last'           => 'خطأ: لا يمكن حذف لوحة المعلومات الأخيرة. من فضلك ، قم بإنشاء واحدة جديدة أولا!',
+        'disable_last'          => 'خطأ: لا يمكن تعطيل لوحة المعلومات الأخيرة. من فضلك ، قم بإنشاء واحدة جديدة أولا!',
     ],
 
 ];
diff --git a/resources/lang/ar-SA/demo.php b/resources/lang/ar-SA/demo.php
index 4493a1d16..2262b25b8 100644
--- a/resources/lang/ar-SA/demo.php
+++ b/resources/lang/ar-SA/demo.php
@@ -3,7 +3,7 @@
 return [
 
     'accounts' => [
-        'cash'              => 'المال',
+        'cash'              => 'النقدية',
     ],
 
     'categories' => [
@@ -19,7 +19,7 @@ return [
     ],
 
     'offline_payments' => [
-        'cash'              => 'المال',
+        'cash'              => 'نقدا',
         'bank'              => 'تحويل بنكي',
     ],
 
diff --git a/resources/lang/ar-SA/email_templates.php b/resources/lang/ar-SA/email_templates.php
index d8a7e260f..c6ce0b5da 100644
--- a/resources/lang/ar-SA/email_templates.php
+++ b/resources/lang/ar-SA/email_templates.php
@@ -9,42 +9,42 @@ return [
 
     'invoice_remind_customer' => [
         'subject'       => 'إشعار بتأخر فاتورة رقم {invoice_number}',
-        'body'          => 'عزيزي {customer_name}،<br /><br /> هذا اشعار بتاخر فاتورة رقم <strong>{invoice_number}</strong>.<br /><br /> مجموع الفاتورة هو {invoice_total} و تاريخ الاستحقاق <strong>{invoice_due_date}</strong>.<br /><br /> يمكنك مشاهدة تفاصيل الفاتورة و اكمال الدفع عن طريق الرابط التالي: <a href="{invoice_guest_link}">{invoice_number}</a><br /><br />تقبل تحيّاتي،<br />{company_name}',
+        'body'          => 'عزيزي {customer_name}،<br /><br /> هذا اشعار بتأخر فاتورة رقم <strong>{invoice_number}</strong>.<br /><br /> مجموع الفاتورة هو {invoice_total} و تاريخ الاستحقاق <strong>{invoice_due_date}</strong>.<br /><br /> يمكنك مشاهدة تفاصيل الفاتورة و اكمال الدفع عن طريق الرابط التالي: <a href="{invoice_guest_link}">{invoice_number}</a><br /><br />تقبل تحيّاتي،<br />{company_name}',
     ],
 
     'invoice_remind_admin' => [
         'subject'       => 'إشعار بتأخر فاتورة رقم {invoice_number}',
-        'body'          => 'مرحبا {customer_name}،<br /><br /> تلقى اشعار بتاخر فاتورة رقم <strong>{invoice_number}</strong>.<br /><br /> مجموع الفاتورة هو {invoice_total} و تاريخ الاستحقاق <strong>{invoice_due_date}</strong>.<br /><br /> يمكنك مشاهدة تفاصيل الفاتورة و اكمال الدفع عن طريق الرابط التالي: <a href="{invoice_admin_link}">{invoice_number}</a><br /><br />تقبل تحيّاتي،<br />{company_name}',
+        'body'          => 'مرحبا {customer_name}،<br /><br /> تلقى اشعار بتأخر فاتورة رقم <strong>{invoice_number}</strong>.<br /><br /> مجموع الفاتورة هو {invoice_total} و تاريخ الاستحقاق <strong>{invoice_due_date}</strong>.<br /><br /> يمكنك مشاهدة تفاصيل الفاتورة و اكمال الدفع عن طريق الرابط التالي: <a href="{invoice_admin_link}">{invoice_number}</a><br /><br />تقبل تحيّاتي،<br />{company_name}',
     ],
 
     'invoice_recur_customer' => [
         'subject'       => 'تم إنشاء فاتورة متكررة',
-        'body'          => 'عزيزي {customer_name}،<br /><br /> قمنا باصدار الفاتورة التالية:<strong>{invoice_number}</strong>.<br /><br /> يمكنك اﻹطلاع على تفاصيل الفاتورة و اكمال الدفع عن طريق الرابط التالي: <a href="{invoice_guest_link}">{invoice_number}</a>.<br /><br />لاتتردد بالتواصل معنا لأي سؤال.<br /><br />تحيّاتي،<br />{company_name}',
+        'body'          => 'عزيزي {customer_name}،<br /><br /> بناء على الإتفاق الدورى,  قمنا باصدار الفاتورة التالية:<strong>{invoice_number}</strong>.<br /><br /> يمكنك اﻹطلاع على تفاصيل الفاتورة و اكمال الدفع عن طريق الرابط التالي: <a href="{invoice_guest_link}">{invoice_number}</a>.<br /><br />لاتتردد بالتواصل معنا لأي سؤال.<br /><br />تحيّاتي،<br />{company_name}',
     ],
 
     'invoice_recur_admin' => [
         'subject'       => '{invoice_number} تم إنشاء فاتورة متكررة',
-        'body'          => 'مرحبا,<br /><br /> استنادا الى الدائرة المتكررة ل {customer_name},<strong>{invoice_number}</strong> تم إنشاء الفاتورة أتوماتكيا <br /><br /> يمكنك الاطلاع على تفاصيل الفاتورة من الرابط:<a href="{invoice_admin_link}">{invoice_number}</a>.<br /><br />مع أطيب التحيات{br /> {company_name>',
+        'body'          => 'مرحبا,<br /><br /> بناء على الإتفاق الدورى ل {customer_name},<strong>{invoice_number}</strong> تم إنشاء الفاتورة أتوماتكيا <br /><br /> يمكنك الاطلاع على تفاصيل الفاتورة من الرابط:<a href="{invoice_admin_link}">{invoice_number}</a>.<br /><br />مع أطيب التحيات{br /> {company_name>',
     ],
 
     'invoice_payment_customer' => [
         'subject'       => 'تم استلام الدفعة لفاتورة رقم {invoice_number}',
-        'body'          => 'عزيزي {customer_name}،<br /><br />شكرا للسداد، تجد تفاصيل الدفع في اﻷسفل:<br /><br />-------------------------------------------------<br /><br />القيمة: <strong>{transaction_total}<br /></strong> التاريخ: <strong>{transaction_paid_date}</strong><br /> رقم الفاتورة: <strong>{invoice_number}<br /><br /></strong>-------------------------------------------------<br /><br /> يمكنك بالتاكيد اﻹطلاع على تفاصيل الفاتورة من خلال الرابط التالي: <a href="{invoice_guest_link}">{invoice_number}</a>.<br /><br />لاتتردد بالتواصل معنا لأي سؤال.<br /><br />تحيّاتي،<br />{company_name}',
+        'body'          => 'عزيزي {customer_name}،<br /><br />شكرا للسداد، سوف تجد تفاصيل الدفع في اﻷسفل:<br /><br />-------------------------------------------------<br /><br />القيمة: <strong>{transaction_total}<br /></strong> التاريخ: <strong>{transaction_paid_date}</strong><br /> رقم الفاتورة: <strong>{invoice_number}<br /><br /></strong>-------------------------------------------------<br /><br /> يمكنك بالتاكيد اﻹطلاع على تفاصيل الفاتورة من خلال الرابط التالي: <a href="{invoice_guest_link}">{invoice_number}</a>.<br /><br />لاتتردد بالتواصل معنا لأي سؤال.<br /><br />تحيّاتي،<br />{company_name}',
     ],
 
     'invoice_payment_admin' => [
         'subject'       => 'تم استلام الدفعة لفاتورة رقم {invoice_number}',
-        'body'          => 'مرحبا، <br /><br />{customer_name} قام بتسديد فاتورة <strong>{invoice_number}</strong>.<br /><br />يمكنك اﻹطلاع على تفاصيل الفاتورة من خلال الرابط التالي: <a href="{invoice_admin_link}">{invoice_number}</a>.<br /><br />تحيّاتي،<br />{company_name}',
+        'body'          => 'مرحبا، <br /><br />{customer_name} قام بتسديد فاتورة رقم  <strong>{invoice_number}</strong>.<br /><br />يمكنك اﻹطلاع على تفاصيل الفاتورة من خلال الرابط التالي: <a href="{invoice_admin_link}">{invoice_number}</a>.<br /><br />تحيّاتي،<br />{company_name}',
     ],
 
     'bill_remind_admin' => [
         'subject'       => '{bill_number} إشعار للتذكير بالفاتورة',
-        'body'          => 'مرحبا {customer_name}،<br /><br /> هذا إشعار بتاخر فاتورة رقم <strong>{invoice_number}</strong>.<br /><br /> مجموع الفاتورة هو {invoice_total} و تاريخ الاستحقاق <strong>{invoice_due_date}</strong>.<br /><br /> يمكنك مشاهدة تفاصيل الفاتورة و اكمال الدفع عن طريق الرابط التالي: <a href="{invoice_admin_link}">{invoice_number}</a><br /><br />تقبل تحيّاتي،<br />{company_name}',
+        'body'          => 'مرحبا {customer_name}،<br /><br /> هذا إشعار بتأخر فاتورة رقم <strong>{invoice_number}</strong>.<br /><br /> مجموع الفاتورة هو {invoice_total} و تاريخ الاستحقاق <strong>{invoice_due_date}</strong>.<br /><br /> يمكنك مشاهدة تفاصيل الفاتورة و اكمال الدفع عن طريق الرابط التالي: <a href="{invoice_admin_link}">{invoice_number}</a><br /><br />تقبل تحيّاتي،<br />{company_name}',
     ],
 
     'bill_recur_admin' => [
         'subject'       => '{invoice_number} تم إنشاء فاتورة متكررة',
-        'body'          => 'مرحبا,<br /><br /> استنادا الى الدائرة المتكررة ل <vendor_name} <strong>{bill_number}</strong} تم إنشاء الفاتورة أتوماتكيا <br /><br /> يمكنك الاطلاع على تفاصيل الفاتورة من الرابط: <a href="{bill_admin_link}">{bill_number}</a>.<br /><br /< Regards,<br />{company_name} مع أطيب التحيات{br /> {company_name>',
+        'body'          => 'مرحبا,<br /><br /> بناء على الإتفاق الدورى ل <vendor_name} <strong>{bill_number}</strong} تم إنشاء الفاتورة أتوماتكيا <br /><br /> يمكنك الاطلاع على تفاصيل الفاتورة من الرابط: <a href="{bill_admin_link}">{bill_number}</a>.<br /><br /< Regards,<br />{company_name} مع أطيب التحيات{br /> {company_name>',
     ],
 
 ];
diff --git a/resources/lang/ar-SA/general.php b/resources/lang/ar-SA/general.php
index f174e7198..f8df0e4d3 100644
--- a/resources/lang/ar-SA/general.php
+++ b/resources/lang/ar-SA/general.php
@@ -33,19 +33,19 @@ return [
     'payment_methods'       => 'طريقة الدفع|طرق الدفع',
     'compares'              => 'الإيراد مقابل المصروف|الإيرادات مقابل المصروفات',
     'notes'                 => 'ملحوظة|الملاحظات',
-    'totals'                => 'المجموع|المجاميع',
+    'totals'                => 'اجمالى|اجماليات',
     'languages'             => 'اللغة|اللغات',
     'updates'               => 'التحديث|التحديثات',
     'numbers'               => 'الرقم|الأرقام',
     'statuses'              => 'الحالة|الحالات',
     'others'                => 'الأخرى|الأخريات',
     'contacts'              => 'جهة اتصال|جهات اتصال',
-    'reconciliations'       => 'المصالحة | المصالحات',
+    'reconciliations'       => 'التسوية | التسويات',
     'developers'            => 'مطور|مطورين',
     'schedules'             => 'جدولة|جدولة',
     'groups'                => 'مجموعة|مجموعات',
     'charts'                => 'رسم بياني|رسوم بيانات',
-    'localisations'         => 'تحديد الموقع | تحديد المواقع',
+    'localisations'         => 'الاعدادات المحلية | الاعدادات المحلية',
     'defaults'              => 'افتراضي|افتراضيات',
     'widgets'               => 'أداة | أدوات',
     'templates'             => 'قالب | قوالب',
@@ -131,14 +131,14 @@ return [
     'created_date'          => 'تاريخ الإنشاء',
     'period'                => 'فترة',
     'frequency'             => 'التكرار',
-    'start'                 => 'إبدأ',
-    'end'                   => 'انهاء',
+    'start'                 => 'البداية',
+    'end'                   => 'النهاية',
     'clear'                 => 'مسح',
-    'difference'            => 'الاختلاف',
+    'difference'            => 'الفرق',
     'footer'                => 'تذييل الصفحة',
     'start_date'            => 'تاريخ البدء',
     'end_date'              => 'تاريخ الانتهاء',
-    'basis'                 => 'أساس',
+    'basis'                 => 'الأساس',
     'accrual'               => 'مستحقات',
     'cash'                  => 'نقدي',
     'group_by'              => 'مجموعة من قبل',
@@ -150,8 +150,8 @@ return [
     'type_item_name'        => 'اكتب اسم العنصر',
     'no_data'               => 'لا توجد بيانات',
     'no_matching_data'      => 'لا توجد بيانات مطابقة',
-    'clear_cache'           => 'مسح التخزين المؤقت',
-    'go_to_dashboard'       => 'الذهاب الى لوحة القيادة',
+    'clear_cache'           => 'مسح الذاكرة المؤقتة',
+    'go_to_dashboard'       => 'الذهاب الى لوحة التحكم',
 
     'card' => [
         'name'                  => 'الإسم على البطاقة',
@@ -191,13 +191,13 @@ return [
 
     'empty' => [
         'documentation' => 'راجع <a href=":url" target="_blank">الوثائق</a>للمزيد من التفاصيل.',
-        'items' => 'يمكن أن تكون العناصر منتجات أو خدمات. يمكنك استخدام العناصر عند إنشاء الفواتير للحصول على حقول السعر والضرائب إلخ.',
+        'items' => 'يمكن أن تكون الأصناف منتجات أو خدمات. يمكنك استخدام الأصناف عند إنشاء الفواتير للحصول على حقول السعر والضرائب إلخ.',
         'invoices' => 'يمكن أن تكون الفواتير مرة واحدة أو متكررة. يمكنك إرسالها إلى العملاء والبدء في قبول المدفوعات عبر الإنترنت.',
         'revenues' => 'الايرادات هي معاملة الدخل المدفوع. يمكن أن يكون سجلًا مستقلًا (أي الإيداع) أو مرفقًا بفاتورة.',
-        'customers' => 'مطلوب العملاء إذا كنت ترغب في إنشاء الفواتير. يمكنهم أيضًا تسجيل الدخول إلى Client Portal ورؤية رصيدهم.',
-        'bills' => 'يمكن أن تكون الفواتير مرة واحدة أو متكررة. إنها تشير إلى ما تدين به للبائعين للمنتجات أو الخدمات التي تشتريها.',
-        'payments' => 'الدفع هو معاملة لمصاريف مدفوعة. يمكن أن يكون سجلًا مستقلًا (مثل إيصال الطعام) أو مرفقًا به فاتورة.',
-        'vendors' => 'البائعين مطلوبين إذا كنت ترغب في إنشاء فواتير. يمكنك رؤية الرصيد الذي تدين به وتصفية تقارير البائع.',
+        'customers' => 'العملاء مطلوبون إذا كنت ترغب في إنشاء الفواتير. يمكنهم أيضًا تسجيل الدخول إلى Client Portal ورؤية رصيدهم.',
+        'bills' => 'يمكن أن تكون الفواتير مرة واحدة أو متكررة. إنها تشير إلى ما تدين به للموردين للمنتجات أو الخدمات التي تشتريها.',
+        'payments' => 'الدفع هو معاملة لمصاريف مدفوعة. يمكن أن يكون سجلًا مستقلًا (مثل إيصال الطعام) أو مرفقًا بفاتورة.',
+        'vendors' => 'الموردين مطلوبين إذا كنت ترغب في إنشاء فواتير. يمكنك رؤية الرصيد الذي تدين به وتصفية تقارير المورد.',
         'transfers' => 'تتيح لك التحويلات نقل الأموال من حساب إلى آخر ، سواء كانت تستخدم العملة نفسها أم لا.',
         'taxes' => 'يتم استخدام الضرائب لتطبيق رسوم إضافية على الفواتير. تتأثر بياناتك المالية بهذه الضرائب التنظيمية.',
         'reconciliations' => 'التسوية المصرفية هي عملية يتم تنفيذها للتأكد من صحة السجلات المصرفية لشركتك.',
diff --git a/resources/lang/ar-SA/header.php b/resources/lang/ar-SA/header.php
index 612931293..7d6b5aafa 100644
--- a/resources/lang/ar-SA/header.php
+++ b/resources/lang/ar-SA/header.php
@@ -7,7 +7,7 @@ return [
     'notifications' => [
         'counter'           => '{0} ليس لديك تنبيهات|{1} لديك :count تنبيهات|[2,*] لديك :count تنبيهات',
         'overdue_invoices'  => '{1} :count فاتورة متأخرة|[2,*] :count فواتير متأخرة',
-        'upcoming_bills'    => '{1} :count فاتورة بيع قادمة|[2,*] :count فواتير بيع قادمة',
+        'upcoming_bills'    => '{1} :count فاتورة قادمة|[2,*] :count فواتير قادمة',
         'view_all'          => 'عرض الكل'
     ],
     'docs_link'             => 'https://akaunting.com/docs',
diff --git a/resources/lang/ar-SA/invoices.php b/resources/lang/ar-SA/invoices.php
index e90d10a90..249bf5798 100644
--- a/resources/lang/ar-SA/invoices.php
+++ b/resources/lang/ar-SA/invoices.php
@@ -26,10 +26,10 @@ return [
     'paid'                  => 'مدفوع',
     'histories'             => 'سجلات',
     'payments'              => 'المدفوعات',
-    'add_payment'           => 'إضافة مدفوعات',
+    'add_payment'           => 'إضافة الدفع',
     'mark_paid'             => 'التحديد كمدفوع',
     'mark_sent'             => 'التحديد كمرسل',
-    'mark_viewed'           => 'المُعَلَمَة شُوهدت',
+    'mark_viewed'           => 'وضع علامة مشاهدة',
     'download_pdf'          => 'تحميل PDF',
     'send_mail'             => 'إرسال بريد إلكتروني',
     'all_invoices'          => 'سجّل الدخول لعرض جميع الفواتير',
@@ -54,7 +54,7 @@ return [
         'marked_sent'       => 'الفاتورة عُلّمت كمرسلة!',
         'marked_paid'       => 'الفاتورة عُلّمت كمدفوع!',
         'email_required'    => 'لا يوجد عنوان البريد إلكتروني لهذا العميل!',
-        'draft'             => 'هذه <b>مسودة</b> الفاتورة و سوف تظهر في الرسوم البيانيّة بعد ارسالها.',
+        'draft'             => 'هذه <b>مسودة</b> الفاتورة و سوف تظهر في النظام بعد ارسالها.',
 
         'status' => [
             'created'       => 'أنشئت في :date',
diff --git a/resources/lang/ar-SA/maintenance.php b/resources/lang/ar-SA/maintenance.php
index 64b272473..da43e1b3b 100644
--- a/resources/lang/ar-SA/maintenance.php
+++ b/resources/lang/ar-SA/maintenance.php
@@ -4,7 +4,7 @@ return [
 
     'title' => 'تحت الصيانة',
 
-    'message' => 'آسف ، نحن في الصيانة. الرجاء معاودة المحاولة في وقت لاحق!',
+    'message' => 'نأسف للإزعاج، النظام قيد الصيانة. الرجاء معاودة المحاولة في وقت لاحق!',
 
     'last-updated' => 'اخر تحديث لهذه الرسالة :timestamp',
 
diff --git a/resources/lang/ar-SA/messages.php b/resources/lang/ar-SA/messages.php
index 2edcab7a2..0718c8991 100644
--- a/resources/lang/ar-SA/messages.php
+++ b/resources/lang/ar-SA/messages.php
@@ -8,7 +8,7 @@ return [
         'deleted'           => 'تم حذف :type!',
         'duplicated'        => 'تم نسخ :type!',
         'imported'          => 'تم استيراد :type!',
-        'exported'          => 'تم استيراد :type!',
+        'exported'          => 'تم تصدير :type!',
         'enabled'           => 'تم تفعيل :type!',
         'disabled'          => 'تم تعطيل :type!',
     ],
@@ -16,7 +16,7 @@ return [
     'error' => [
         'over_payment'      => 'خطأ: الدفعه لم تُضاف! المبلغ المدخل يتخطى المجموع: :amount',
         'not_user_company'  => 'خطأ: غير مسموح لك بإدارة هذه الشركة!',
-        'customer'          => 'خطأ: لم تتم إضافة المستخدم! :name يستخدم هذا البريد الإلكتروني مسبقاً.',
+        'customer'          => 'خطأ: لم تتم إضافة المستخدم! :name يستخدم بالفعل هذا البريد الإلكتروني.',
         'no_file'           => 'خطأ: لم يتم تحديد أي ملف!',
         'last_category'     => 'خطأ: لا يمكن حذف آخر فئة من :type!',
         'change_type'       => 'خطأ: لا يمكنك تغيير النوع لارتباطه مع :text!',
diff --git a/resources/lang/ar-SA/modules.php b/resources/lang/ar-SA/modules.php
index b4f673da7..ce0892220 100644
--- a/resources/lang/ar-SA/modules.php
+++ b/resources/lang/ar-SA/modules.php
@@ -5,9 +5,9 @@ return [
     'api_key'               => 'مفتاح API',
     'my_apps'               => 'تطبيقاتي',
     'pre_sale'              => 'قبل البيع',
-    'top_paid'              => 'أعلى المدفوعات',
+    'top_paid'              => 'أعلى مدفوعات',
     'new'                   => 'جديد',
-    'top_free'              => 'المجانيات الأعلى',
+    'top_free'              => 'أعلى مجانيات ',
     'free'                  => 'مجاناً',
     'search'                => 'بحث',
     'install'               => 'تثبيت',
@@ -36,7 +36,7 @@ return [
         'installation'      => 'التثبيت',
         'faq'               => 'الأسئلة الشائعة',
         'changelog'         => 'سجل التغييرات',
-        'reviews'           => 'مراجعات',
+        'reviews'           => 'التقييمات',
     ],
 
     'installation' => [
@@ -52,7 +52,7 @@ return [
     'errors' => [
         'download'          => 'لم نتمكن من تحميل :module',
         'zip'               => 'لم نتمكن من انشاء ملف zip :module',
-        'unzip'             => 'لم نتمكن من إستخراج :module',
+        'unzip'             => 'لم نتمكن من فك ضغط :module',
         'file_copy'         => 'لم نتمكن من نسخ ملفات :module',
         'finish'            => 'لم نتمكن من انهاء تثبيت :module',
     ],
@@ -75,10 +75,10 @@ return [
 
     'reviews' => [
         'button' => [
-            'add'           => 'أضف مراجعة'
+            'add'           => 'أضف تقييمك'
         ],
 
-        'na'                => 'لا يوجد مراجعات.'
+        'na'                => 'لا يوجد تقييمات.'
     ],
 
 ];
diff --git a/resources/lang/ar-SA/reconciliations.php b/resources/lang/ar-SA/reconciliations.php
index 09842edf6..3fe8d7780 100644
--- a/resources/lang/ar-SA/reconciliations.php
+++ b/resources/lang/ar-SA/reconciliations.php
@@ -6,7 +6,7 @@ return [
     'reconciled'            => 'تمت التسوية',
     'closing_balance'       => 'الرصيد الختامي',
     'unreconciled'          => 'لم تتم التسوية',
-    'transactions'          => 'الإجراءات',
+    'transactions'          => 'المعاملات',
     'start_date'            => 'تاريخ البدء',
     'end_date'              => 'تاريخ الانتهاء',
     'cleared_amount'        => 'صافي القيمة',
diff --git a/resources/lang/ar-SA/settings.php b/resources/lang/ar-SA/settings.php
index e4b6cb62e..751122dfd 100644
--- a/resources/lang/ar-SA/settings.php
+++ b/resources/lang/ar-SA/settings.php
@@ -3,7 +3,7 @@
 return [
 
     'company' => [
-        'description'       => 'تغيير اسم الشركه، البريد اﻹلكتروني، العناوين، الرقم الضريبي الخ',
+        'description'       => 'تغيير اسم الشركه، البريد اﻹلكتروني، العنوان، الرقم الضريبي الخ',
         'name'              => 'الاسم',
         'email'             => 'البريد الإلكتروني',
         'phone'             => 'رقم الهاتف',
@@ -12,7 +12,7 @@ return [
     ],
 
     'localisation' => [
-        'description'       => 'قم بتعيين السنة المالية والمنطقة الزمنية وتنسيق التاريخ والمزيد من المواقع',
+        'description'       => 'قم بتحديد السنة المالية والمنطقة الزمنية وصيغة التاريخ والمزيد من الاعدادات',
         'financial_start'   => 'بدء السنة المالية',
         'timezone'          => 'التوقيت',
         'date' => [
@@ -44,7 +44,7 @@ return [
         'service'           => 'الخدمات',
         'price_name'        => 'اسم السعر',
         'price'             => 'السعر',
-        'rate'              => 'قيّم',
+        'rate'              => 'معدل',
         'quantity_name'     => 'اسم الكمية',
         'quantity'          => 'الكمية',
         'payment_terms'     => 'شروط الدفع',
@@ -105,7 +105,7 @@ return [
         'send_bill'         => 'إرسال تذكير لفاتورة الشراء',
         'bill_days'         => 'إرسال قبل ميعاد الاستحقاق بأيام',
         'cron_command'      => 'أمر التكرار',
-        'schedule_time'     => 'ساعة البدء',
+        'schedule_time'     => 'ساعة التنفيذ',
     ],
 
     'categories' => [
diff --git a/resources/lang/ar-SA/validation.php b/resources/lang/ar-SA/validation.php
index d12bf7217..d01324e47 100644
--- a/resources/lang/ar-SA/validation.php
+++ b/resources/lang/ar-SA/validation.php
@@ -13,7 +13,7 @@ return [
     |
     */
 
-    'accepted'             => 'يجب أن يتم القبول على خانة :attribute.',
+    'accepted'             => 'يجب أن يتم قبول خانة :attribute.',
     'active_url'           => 'خانة :attribute تحتوي على رابط غير صحيح.',
     'after'                => 'يجب على خانة :attribute أن تكون تاريخًا لاحقًا للتاريخ :date.',
     'after_or_equal'       => 'يجب على خانة :attribute أن تكون تاريخًا لاحقًا أو مطابقًا للتاريخ :date.',
@@ -76,15 +76,15 @@ return [
     'required_without_all' => 'الخانة :attribute إلزامية إذا لم يتوفّر أياً من :values.',
     'same'                 => 'يجب أن تتطابق خانة :attribute مع :other.',
     'size'                 => [
-        'numeric' => 'يجب أن تكون قيمة خانة :attribute مساوية للعدد :size.',
+        'numeric' => 'يجب أن تكون قيمة خانة :attribute مساوية ل :size.',
         'file'    => 'يجب أن يكون حجم الملف :attribute يساوي :size كيلوبايت.',
         'string'  => 'هذه الخانة :attribute يجب ان تكون <strong>:size حرف</strong>.',
         'array'   => 'يجب أن تحتوي خانة :attribute على :size من العناصر.',
     ],
     'string'               => 'هذه الخانة :attribute يجب ان تكون <strong>نص</strong>.',
     'timezone'             => 'يجب أن تكون خانة :attribute نطاقًا زمنيًا صحيحًا.',
-    'unique'               => 'هذه الخانة :attribute <strong>مأخوذة</strong>.',
-    'uploaded'             => 'هذه الخانة :attribute <strong>فشلت</strong> عند الرفع.',
+    'unique'               => 'هذه الخانة :attribute <strong>مستخدمة بالفعل</strong>.',
+    'uploaded'             => 'هذه الخانة :attribute <strong>فشلت</strong> عند تحميلها على النظام.',
     'url'                  => 'تنسيق هذه الخانة :attribute <strong>غير صالح</strong>.',
 
     /*
diff --git a/resources/lang/ar-SA/widgets.php b/resources/lang/ar-SA/widgets.php
index 6d67c2585..61b4391cb 100644
--- a/resources/lang/ar-SA/widgets.php
+++ b/resources/lang/ar-SA/widgets.php
@@ -7,7 +7,7 @@ return [
     'open_invoices'             => 'الفواتير المفتوحة',
     'overdue_invoices'          => 'الفواتير المتأخرة',
     'total_expenses'            => 'إجمالي المصاريف',
-    'payables'                  => 'إمكانية الدفع',
+    'payables'                  => 'المستحقات علينا',
     'open_bills'                => 'فواتير مفتوحة',
     'overdue_bills'             => 'فواتير متأخرة',
     'total_profit'              => 'إجمالي الربح',
diff --git a/resources/lang/hi-IN/auth.php b/resources/lang/hi-IN/auth.php
index 36da604e7..bb6891b71 100644
--- a/resources/lang/hi-IN/auth.php
+++ b/resources/lang/hi-IN/auth.php
@@ -13,6 +13,7 @@ return [
     'current_email'         => 'वर्तमान ईमेल',
     'reset'                 => 'रीसेट',
     'never'                 => 'कभी नहीँ',
+    'landing_page'          => 'लैंडिंग पेज',
 
     'password' => [
         'current'           => 'पासवर्ड',
diff --git a/resources/lang/hi-IN/bills.php b/resources/lang/hi-IN/bills.php
index 02388b134..81b4dbede 100644
--- a/resources/lang/hi-IN/bills.php
+++ b/resources/lang/hi-IN/bills.php
@@ -40,6 +40,8 @@ return [
         'received'          => 'स्वीकार किया',
         'partial'           => 'आंशिक',
         'paid'              => 'भुगतान किया',
+        'overdue'           => 'समय पर भुगतान नहीं किया',
+        'unpaid'            => 'भुगतान नहीं किया है',
     ],
 
     'messages' => [
diff --git a/resources/lang/hi-IN/bulk_actions.php b/resources/lang/hi-IN/bulk_actions.php
index 7acca74d7..ba90bcf1b 100644
--- a/resources/lang/hi-IN/bulk_actions.php
+++ b/resources/lang/hi-IN/bulk_actions.php
@@ -6,14 +6,14 @@ return [
     'selected'         => 'चयनित',
 
     'message' => [
-        'duplicate'     => 'Are you sure you want to <b>duplicate</b> selected record?',
-        'delete'        => 'Are you sure you want to <b>delete</b> selected record?|Are you sure you want to <b>delete</b> selected records?',
-        'export'        => 'Are you sure you want to <b>export</b> selected record?|Are you sure you want to <b>export</b> selected records?',
-        'enable'        => 'Are you sure you want to <b>enable</b> selected record?|Are you sure you want to <b>enable</b> selected records?',
-        'disable'       => 'Are you sure you want to <b>disable</b> selected record?|Are you sure you want to <b>disable</b> selected records?',
-        'paid'          => 'Are you sure you want to mark selected invoice as <b>paid</b>?|Are you sure you want to mark selected invoices as <b>paid</b>?',
-        'sent'          => 'Are you sure you want to mark selected invoice as <b>sent</b>?|Are you sure you want to mark selected invoices as <b>sent</b>?',
-        'received'      => 'Are you sure you want to mark selected bill as <b>received</b>?|Are you sure you want to mark selected bills as <b>received</b>?',
+        'duplicate'     => 'क्या आप वाकई चयनित रिकॉर्ड की <b>प्रतिलिपि</b> करना चाहते हैं?',
+        'delete'        => 'क्या आप वाकई चयनित रिकॉर्ड <b>हटाना</b> चाहते हैं?|क्या आप सुनिश्चित हैं कि आप चयनित रिकॉर्ड <b>हटाना</b> चाहते हैं?',
+        'export'        => 'क्या आप सुनिश्चित हैं कि आप चयनित रिकॉर्ड <b>निर्यात</b> करना चाहते हैं?|क्या आप सुनिश्चित हैं कि आप चयनित रिकॉर्ड <b>निर्यात</b> करना चाहते हैं?',
+        'enable'        => 'क्या आप वाकई चयनित रिकॉर्ड को <b>सक्रिय</b> करना चाहते हैं?|क्या आप वाकई चयनित रिकॉर्ड को <b>सक्रिय</b> करना चाहते हैं?',
+        'disable'       => 'क्या आप वाकई चयनित रिकॉर्ड को <b>निष्क्रिय</b> करना चाहते हैं?|क्या आप वाकई चयनित रिकॉर्ड को <b>निष्क्रिय</b> करना चाहते हैं?',
+        'paid'          => 'क्या आप वाकई चयनित चालान को <b>भुगतान</b> के रूप में चिह्नित करना चाहते हैं?|क्या आप सुनिश्चित हैं कि आप चयनित चालान को <b>भुगतान</b> के रूप में चिह्नित करना चाहते हैं?',
+        'sent'          => 'क्या आप सुनिश्चित हैं कि आप चयनित चालान को <b>भेजे गए</b> के रूप में चिह्नित करना चाहते हैं?|क्या आप सुनिश्चित हैं कि आप चयनित चालान को <b>भेजे गए</b> के रूप में चिह्नित करना चाहते हैं?',
+        'received'      => 'क्या आप वाकई चयनित बिल को <b>प्राप्त किये</b> गए के रूप में चिह्नित करना चाहते हैं?|क्या आप वाकई चयनित बिलों को <b>प्राप्त किये</b> गए के रूप में चिह्नित करना चाहते हैं?',
     ],
 
 ];
diff --git a/resources/lang/hi-IN/companies.php b/resources/lang/hi-IN/companies.php
index f0a5d8911..12bbf1d3d 100644
--- a/resources/lang/hi-IN/companies.php
+++ b/resources/lang/hi-IN/companies.php
@@ -4,12 +4,11 @@ return [
 
     'domain'                => 'डोमेन',
     'logo'                  => 'लोगो',
-    'manage'                => 'कंपनियों का प्रबंधन करें',
-    'all'                   => 'सभी कंपनियां',
 
     'error' => [
         'not_user_company'  => 'त्रुटि: आपको इस कंपनी को बदलने की अनुमति नहीं है!',
-        'delete_active'     => 'त्रुटि: सक्रिय कंपनी को हटा नहीं सकते, कृपया, इसे पहले बदलें!',
+        'delete_active'     => 'त्रुटि: सक्रिय कंपनी को हटा नहीं सकते। कृपया, पहले दूसरे पर स्विच करें!',
+        'disable_active'    => 'त्रुटि: सक्रिय कंपनी को निष्क्रिय नहीं कर सकते। कृपया, पहले दूसरे पर स्विच करें!',
     ],
 
 ];
diff --git a/resources/lang/hi-IN/customers.php b/resources/lang/hi-IN/customers.php
index c055486ba..f14a7a3a6 100644
--- a/resources/lang/hi-IN/customers.php
+++ b/resources/lang/hi-IN/customers.php
@@ -6,7 +6,7 @@ return [
     'user_created'          => 'उपयोगकर्ता बनाया गया',
 
     'error' => [
-        'email'             => 'ईमेल पहले ही ली जा चुकी हैं।'
+        'email'             => 'ईमेल पहले ही ली जा चुकी हैं।',
     ],
 
 ];
diff --git a/resources/lang/hi-IN/dashboards.php b/resources/lang/hi-IN/dashboards.php
new file mode 100644
index 000000000..30f30e6eb
--- /dev/null
+++ b/resources/lang/hi-IN/dashboards.php
@@ -0,0 +1,11 @@
+<?php
+
+return [
+
+    'error' => [
+        'not_user_dashboard'    => 'त्रुटि: आपको इस डैशबोर्ड को बदलने की अनुमति नहीं है!',
+        'delete_last'           => 'त्रुटि: अंतिम डैशबोर्ड को हटा नहीं सकते। कृपया, पहले एक नया बनाएं!',
+        'disable_last'          => 'त्रुटि: अंतिम डैशबोर्ड को निष्क्रिय नहीं कर सकते। कृपया, पहले एक नया बनाएं!',
+    ],
+
+];
diff --git a/resources/lang/hi-IN/demo.php b/resources/lang/hi-IN/demo.php
index 1121d3a75..99fda00ae 100644
--- a/resources/lang/hi-IN/demo.php
+++ b/resources/lang/hi-IN/demo.php
@@ -2,12 +2,33 @@
 
 return [
 
-    'accounts_cash'         => 'नकद',
-    'categories_deposit'    => 'जमा',
-    'categories_sales'      => 'बिक्री',
-    'currencies_usd'        => 'अमेरिकी डॉलर',
-    'currencies_eur'        => 'यूरो',
-    'currencies_gbp'        => 'ब्रिटिश पाउंड',
-    'currencies_try'        => 'तुर्की लीरा',
+    'accounts' => [
+        'cash'              => 'नकद',
+    ],
+
+    'categories' => [
+        'deposit'           => 'जमा',
+        'sales'             => 'बिक्री',
+    ],
+
+    'currencies' => [
+        'usd'               => 'अमेरिकी डॉलर',
+        'eur'               => 'यूरो',
+        'gbp'               => 'ब्रिटिश पाउंड',
+        'try'               => 'तुर्की लीरा',
+    ],
+
+    'offline_payments' => [
+        'cash'              => 'नकद',
+        'bank'              => 'बैंक ट्रांसफर',
+    ],
+
+    'reports' => [
+        'income'            => 'श्रेणी के द्वारा मासिक आय सारांश।',
+        'expense'           => 'श्रेणी के अनुसार मासिक व्यय सारांश।',
+        'income_expense'    => 'श्रेणी के हिसाब से मासिक आय vs व्यय।',
+        'tax'               => 'त्रैमासिक कर सारांश।',
+        'profit_loss'       => 'श्रेणी के अनुसार त्रैमासिक लाभ और हानि।',
+    ],
 
 ];
diff --git a/resources/lang/hi-IN/errors.php b/resources/lang/hi-IN/errors.php
index 330d63a89..0a5942a63 100644
--- a/resources/lang/hi-IN/errors.php
+++ b/resources/lang/hi-IN/errors.php
@@ -2,23 +2,22 @@
 
 return [
 
-    'forbidden_access' => 'प्रवेश निषिद्ध',
-    'error_page'       => 'त्रुटि पृष्ठ',
-    'page_not_found'   => 'पृष्ठ नहीं मिला',
-
-    'body'   => [
-        'forbidden_access' => 'ऊप्स! प्रवेश निषिद्ध।',
-        'error_page' => 'ऊप्स! कुछ गलत हो गया।',
-        'page_not_found' => 'ऊप्स! पृष्ठ नहीं मिला।',
+    'title' => [
+        '403' => 'ऊप्स! प्रवेश वर्जित',
+        '404' => 'ऊप्स! पृष्ठ नहीं मिला',
+        '500' => 'ऊप्स! कुछ गलत हो गया',
     ],
 
-    'messages'   => [
-        'forbidden_access' => 'आप इस पेज तक नहीं पहुँच सकते।
-         इस बीच, आप <a href=":link"> डैशबोर्ड पर लौट सकते हैं।</a>',
-        'error_page' => 'हम उस समय को ठीक करने पर काम करेंगे।
-         इस बीच, आप <a href=":link"> डैशबोर्ड पर लौट सकते हैं।</a>',
-        'page_not_found' => 'आपको वह पृष्ठ नहीं मिला, जिसकी आप तलाश कर रहे थे।
-         इस बीच, आप <a href=":link"> डैशबोर्ड पर लौट सकते हैं।</a>',
+    'header' => [
+        '403' => '403 वर्जित',
+        '404' => '404 नहीं मिला',
+        '500' => '500 आंतरिक सर्वर त्रुटि',
+    ],
+
+    'message' => [
+        '403' => 'आप इस पेज तक नहीं पहुँच सकते।',
+        '404' => 'आपको वह पृष्ठ नहीं मिला, जिसकी आप तलाश कर रहे थे।',
+        '500' => 'हम इसे ठीक करने पर तुरंत काम करेंगे।',
     ],
 
 ];
diff --git a/resources/lang/hi-IN/general.php b/resources/lang/hi-IN/general.php
index fde8b3b4a..96b94fa42 100644
--- a/resources/lang/hi-IN/general.php
+++ b/resources/lang/hi-IN/general.php
@@ -48,8 +48,10 @@ return [
     'localisations'         => 'स्थानीयकरण|स्थानीयकरण',
     'defaults'              => 'डिफ़ॉल्ट|डिफ़ॉल्ट',
     'widgets'               => 'विजेट|विजेट',
+    'templates'             => 'टेम्पलेट|टेम्पलेट्स',
+    'sales'                 => 'बिक्री|बिक्री',
+    'purchases'             => 'खरीद|खरीद',
 
-    'dashboard'             => 'डैशबोर्ड',
     'welcome'               => 'स्वागत हे',
     'banking'               => 'बैंकिंग',
     'general'               => 'सामान्य',
@@ -68,10 +70,13 @@ return [
     'yearly'                => 'वार्षिक',
     'add'                   => 'जोड़ें',
     'add_new'               => 'नया जोड़ें',
+    'add_income'            => 'आय जोड़ें',
+    'add_expense'           => 'व्यय जोड़ें',
     'show'                  => 'देखें',
     'edit'                  => 'संपादित करें',
     'delete'                => 'हटायें',
     'send'                  => 'भेजें',
+    'share'                 => 'शेयर',
     'download'              => 'डाउनलोड',
     'delete_confirm'        => ':name :type हटाने की पुष्टि करें?',
     'name'                  => 'नाम',
@@ -89,7 +94,7 @@ return [
     'reference'             => 'संदर्भ',
     'attachment'            => 'अटैचमेंट',
     'change'                => 'बदलें',
-    'change_type'           => 'Change :type',
+    'change_type'           => ':type प्रकार बदलें',
     'switch'                => 'बदलें',
     'color'                 => 'रंग',
     'save'                  => 'सेव करे',
@@ -123,7 +128,6 @@ return [
     'disable'               => 'निष्क्रिय',
     'select_all'            => 'सभी का चयन करे',
     'unselect_all'          => 'सभी का चयन रद्द करे',
-    'go_to'                 => ':name पर जाये',
     'created_date'          => 'रचना तारीख',
     'period'                => 'अवधि',
     'frequency'             => 'आवृत्ति',
@@ -133,11 +137,28 @@ return [
     'difference'            => 'अंतर',
     'footer'                => 'फुटर',
     'start_date'            => 'आरंभ करने की तारीख',
+    'end_date'              => 'समाप्ति की तारीख',
     'basis'                 => 'आधार',
     'accrual'               => 'प्रोद्भवन',
     'cash'                  => 'नकद',
     'group_by'              => 'समूह द्वारा',
     'accounting'            => 'लेखांकन',
+    'sort'                  => 'छाँटें',
+    'width'                 => 'चौड़ाई',
+    'month'                 => 'महीना',
+    'year'                  => 'वर्ष',
+    'type_item_name'        => 'एक आइटम नाम लिखें',
+    'no_data'               => 'कोई आकड़ा उपलब्ध नहीं है',
+    'no_matching_data'      => 'कोई मिलान डेटा नहीं',
+    'clear_cache'           => 'कैश को साफ़ करें',
+    'go_to_dashboard'       => 'डैशबोर्ड पर जाएं',
+
+    'card' => [
+        'name'                  => 'कार्ड पर नाम',
+        'number'                => 'कार्ड नंबर',
+        'expiration_date'       => 'समाप्ति तिथि',
+        'cvv'                   => 'कार्ड CVV',
+    ],
 
     'title' => [
         'new'               => 'नई :type',
@@ -147,6 +168,7 @@ return [
         'send'              => ':type भेजें',
         'get'               => ':type ले आओ',
         'add'               => ':type जोड़ें',
+        'manage'            => ':type प्रबंधित',
     ],
 
     'form' => [
@@ -176,6 +198,9 @@ return [
         'bills' => 'बिल एक समय या आवर्ती हो सकते हैं। वे संकेत करते हैं कि आपके द्वारा खरीदे जाने वाले उत्पादों या सेवाओं के लिए आप अपने विक्रेताओं को क्या देते हैं।',
         'payments' => 'भुगतान एक भुगतान व्यय लेनदेन है। यह एक स्वतंत्र रिकॉर्ड (यानी खाद्य रसीद) हो सकता है या बिल से जुड़ा हो सकता है।',
         'vendors' => 'यदि आप बिल बनाना चाहते हैं तो विक्रेताओं की आवश्यकता है। आप शेष राशि देख सकते हैं और विक्रेता द्वारा रिपोर्ट फ़िल्टर कर सकते हैं।',
+        'transfers' => 'ट्रांसफ़र आपको एक खाते से दूसरे खाते में पैसा स्थानांतरित करने की अनुमति देते हैं, चाहे वे एक ही मुद्रा का उपयोग करें या नहीं।',
+        'taxes' => 'टैक्स का उपयोग चालान और बिलों में अतिरिक्त शुल्क लगाने के लिए किया जाता है। आपके वित्तीय इन नियामक करों से प्रभावित होते हैं।',
+        'reconciliations' => 'बैंक सुलह एक प्रक्रिया है जो यह सुनिश्चित करने के लिए की जाती है कि आपकी कंपनी के बैंक रिकॉर्ड भी सही हैं।',
     ],
 
 ];
diff --git a/resources/lang/hi-IN/invoices.php b/resources/lang/hi-IN/invoices.php
index 72ee3b952..82117afc9 100644
--- a/resources/lang/hi-IN/invoices.php
+++ b/resources/lang/hi-IN/invoices.php
@@ -29,6 +29,7 @@ return [
     'add_payment'           => 'भुगतान जोड़ें',
     'mark_paid'             => 'मार्क करे की भुगतान किया हुआ है',
     'mark_sent'             => 'मार्क करे की भेजा गया',
+    'mark_viewed'           => 'मार्क किया हुआ देखे',
     'download_pdf'          => 'डाउनलोड PDF',
     'send_mail'             => 'ईमेल भेजें',
     'all_invoices'          => 'सभी चालान देखने के लिए लॉगिन करें',
@@ -39,11 +40,13 @@ return [
 
     'statuses' => [
         'draft'             => 'ड्राफ्ट',
-        'sent'              => 'भेजें',
+        'sent'              => 'भेजे गए',
         'viewed'            => 'देखा गया',
-        'approved'          => 'मंजूर करें',
+        'approved'          => 'स्वीकृत',
         'partial'           => 'आंशिक',
-        'paid'              => 'भुगतान किया',
+        'paid'              => 'भुगतान किया है',
+        'overdue'           => 'समय पर भुगतान नहीं किया',
+        'unpaid'            => 'भुगतान नहीं किया है',
     ],
 
     'messages' => [
diff --git a/resources/lang/hi-IN/maintenance.php b/resources/lang/hi-IN/maintenance.php
index 6d1051f94..ae5725478 100644
--- a/resources/lang/hi-IN/maintenance.php
+++ b/resources/lang/hi-IN/maintenance.php
@@ -2,10 +2,10 @@
 
 return [
 
-    'title' => 'रखरखाव मोड',
+    'title' => 'रखरखाव जारी',
 
-    'message' => 'वर्तमान में हम साइट पर काम कर रहे हैं, कृपया बाद में पुनः प्रयास करें!',
+    'message' => 'क्षमा करें, हम रखरखाव के लिए डाउन हैं। बाद में पुन: प्रयास करें!',
 
-    'last-updated' => 'यह संदेश अंतिम बार अपडेट किया गया था :timestamp',
+    'last-updated' => ':timestamp यह संदेश अंतिम बार अपडेट किया गया था।',
 
-];
\ No newline at end of file
+];
diff --git a/resources/lang/hi-IN/messages.php b/resources/lang/hi-IN/messages.php
index 8b2c89850..409f3f0ae 100644
--- a/resources/lang/hi-IN/messages.php
+++ b/resources/lang/hi-IN/messages.php
@@ -8,6 +8,7 @@ return [
         'deleted'           => ':type हटा दिया गया!',
         'duplicated'        => ':type प्रतिलिपि बनाई गई!',
         'imported'          => ':type इम्पोर्ट किया गया!',
+        'exported'          => ':type निर्यात!',
         'enabled'           => ':type सक्रिय किया गया!',
         'disabled'          => ':type निष्क्रिय किया गया!!',
     ],
@@ -19,7 +20,7 @@ return [
         'no_file'           => 'त्रुटि: कोई फ़ाइल चयनित नहीं!',
         'last_category'     => 'त्रुटि: अंतिम :type श्रेणी को हटा नहीं सकते हैं!',
         'change_type'       => 'त्रुटि: प्रकार बदल नहीं सकता क्योंकि इसमें :text संबंधित है!',
-        'invalid_apikey'    => 'Error: The API Key entered is invalid!',
+        'invalid_apikey'    => 'त्रुटि: दर्ज की गई API कुंजी अमान्य है!',
         'import_column'     => 'त्रुटि: :message शीट का नाम: :sheet। पंक्ति संख्या::line।',
         'import_sheet'      => 'त्रुटि: शीट का नाम मान्य नहीं है। कृपया, नमूना फ़ाइल की जाँच करें।',
     ],
diff --git a/resources/lang/hi-IN/modules.php b/resources/lang/hi-IN/modules.php
index 3f02a453b..f11bffd78 100644
--- a/resources/lang/hi-IN/modules.php
+++ b/resources/lang/hi-IN/modules.php
@@ -12,10 +12,9 @@ return [
     'search'                => 'खोज',
     'install'               => 'इंस्टॉल करें',
     'buy_now'               => 'अभी खरीदें',
-    'api_key_link'          => 'अपनी API कुंजी प्राप्त करने के लिए <a class="text-red" href="https://akaunting.com/profile" target="_blank"> यहां क्लिक करें </a>।',
+    'get_api_key'           => 'अपनी एपीआई कुंजी प्राप्त करने के लिए यहां <a href=":url" target="_blank">क्लिक</a> करें।',
     'no_apps'               => 'इस श्रेणी में अभी तक कोई एप्लिकेशन नहीं हैं।',
-    'developer'             => 'क्या आप एक डेवलपर हैं? <a href="https://akaunting.com/developers" target="_blank">यहां</a> आप सीख सकते हैं कि ऐप कैसे बनाएं और आज से बिक्री शुरू करें!',
-
+    'become_developer'      => 'क्या आप एक डेवलपर हैं? <a href=":url" target="_blank">यहां</a> आप सीख सकते हैं कि ऐप कैसे बनाएं और आज बेचना शुरू करें!',
     'recommended_apps'      => 'अनुशंसित ऐप्स',
 
     'about'                 => 'के बारे में',
@@ -80,5 +79,6 @@ return [
         ],
 
         'na'                => 'कोई समीक्षा नहीं है।'
-    ]
+    ],
+
 ];
diff --git a/resources/lang/hi-IN/pagination.php b/resources/lang/hi-IN/pagination.php
index 5b5c01cfb..ead792f1c 100644
--- a/resources/lang/hi-IN/pagination.php
+++ b/resources/lang/hi-IN/pagination.php
@@ -2,9 +2,9 @@
 
 return [
 
-    'previous'              => '&laquo; पिछला',
-    'next'                  => 'अगला &raquo;',
-    'showing'               => ':first-:last of :total records.',
+    'previous'              => 'पिछला',
+    'next'                  => 'अगला',
+    'showing'               => ':total में से :first-:last रिकॉर्ड।',
     'page'                  => 'प्रति पेज।',
 
 ];
diff --git a/resources/lang/hi-IN/reports.php b/resources/lang/hi-IN/reports.php
index 821ad80b5..3d4477b14 100644
--- a/resources/lang/hi-IN/reports.php
+++ b/resources/lang/hi-IN/reports.php
@@ -12,7 +12,7 @@ return [
     'net_profit'            => 'शुद्ध लाभ',
     'total_expenses'        => 'कुल व्यय',
     'net'                   => 'शुद्ध',
-    'income-expense'        => 'आय & व्यय',
+    'income_expense'        => 'आय & व्यय',
 
     'summary' => [
         'income'            => 'आय का सारांश',
diff --git a/resources/lang/hi-IN/settings.php b/resources/lang/hi-IN/settings.php
index 28c0e799b..ff7ea8d58 100644
--- a/resources/lang/hi-IN/settings.php
+++ b/resources/lang/hi-IN/settings.php
@@ -52,6 +52,10 @@ return [
         'subheading'        => 'उपशीर्षक',
         'due_receipt'       => 'प्राप्ति पर देय',
         'due_days'          => ':days दिनों के भीतर देय',
+        'choose_template'   => 'चालान टेम्पलेट चुनें',
+        'default'           => 'पूर्व निर्धारित',
+        'classic'           => 'क्लासिक',
+        'modern'            => 'नवीन',
     ],
 
     'default' => [
diff --git a/resources/lang/hi-IN/dashboard.php b/resources/lang/hi-IN/widgets.php
similarity index 87%
rename from resources/lang/hi-IN/dashboard.php
rename to resources/lang/hi-IN/widgets.php
index f550004bd..e29be87b9 100644
--- a/resources/lang/hi-IN/dashboard.php
+++ b/resources/lang/hi-IN/widgets.php
@@ -2,7 +2,7 @@
 
 return [
 
-    'total_incomes'             => 'कुल आय',
+    'total_income'              => 'कुल आय',
     'receivables'               => 'प्राप्तियां',
     'open_invoices'             => 'वर्तमान चालान',
     'overdue_invoices'          => 'समय पर भुगतान नहीं किये हुए चालान',
@@ -15,9 +15,9 @@ return [
     'overdue_profit'            => 'समय पर भुगतान नहीं किया हुआ लाभ',
     'cash_flow'                 => 'नकद प्रवाह',
     'no_profit_loss'            => 'ना लाभ ना हानि',
-    'incomes_by_category'       => 'श्रेणी के अनुसार आय',
+    'income_by_category'        => 'श्रेणी के अनुसार आय',
     'expenses_by_category'      => 'श्रेणी के अनुसार व्यय',
     'account_balance'           => 'खाते का बैलेंस',
-    'latest_incomes'            => 'नवीनतम आय',
+    'latest_income'             => 'नवीनतम आय',
     'latest_expenses'           => 'नवीनतम व्यय',
 ];
diff --git a/resources/lang/nb-NO/auth.php b/resources/lang/nb-NO/auth.php
index 3db6c1434..9b16d574b 100644
--- a/resources/lang/nb-NO/auth.php
+++ b/resources/lang/nb-NO/auth.php
@@ -13,16 +13,18 @@ return [
     'current_email'         => 'Gjeldende e-post',
     'reset'                 => 'Tilbakestill',
     'never'                 => 'aldri',
-    
+    'landing_page'          => 'Landingsside',
+
     'password' => [
         'current'           => 'Passord',
         'current_confirm'   => 'Passordbekreftelse',
         'new'               => 'Nytt passord',
         'new_confirm'       => 'Passordbekreftelse',
     ],
-    
+
     'error' => [
         'self_delete'       => 'Feil: Du kan ikke slette deg selv.',
+        'self_disable'      => 'Feil: Du kan ikke deaktivere deg selv!',
         'no_company'        => 'Feil: Ingen foretak knyttet til din konto. Vennligst kontakt systemadministrator.',
     ],
 
diff --git a/resources/lang/nb-NO/bills.php b/resources/lang/nb-NO/bills.php
index 7b3b9dd62..71f5e8f68 100644
--- a/resources/lang/nb-NO/bills.php
+++ b/resources/lang/nb-NO/bills.php
@@ -36,10 +36,12 @@ return [
     'make_payment'          => 'Opprett betaling',
 
     'statuses' => [
-        'draft'             => 'Utkast',
+        'draft'             => 'Kladd',
         'received'          => 'Mottatt',
         'partial'           => 'Delvis',
         'paid'              => 'Betalt',
+        'overdue'           => 'Forfalt',
+        'unpaid'            => 'Ubetalt',
     ],
 
     'messages' => [
diff --git a/resources/lang/nb-NO/bulk_actions.php b/resources/lang/nb-NO/bulk_actions.php
new file mode 100644
index 000000000..5b2d1f70c
--- /dev/null
+++ b/resources/lang/nb-NO/bulk_actions.php
@@ -0,0 +1,19 @@
+<?php
+
+return [
+
+    'bulk_actions'     => 'Massehandling|Massehandlinger',
+    'selected'         => 'valgt',
+
+    'message' => [
+        'duplicate'     => 'Er du sikker på at du vil <b>duplisere</b> de utvalgte oppføring(er)?',
+        'delete'        => 'Er du sikker på at du vil <b>slette</b> valgt oppføring?|Er du sikker på at du vil <b>slette</b> valgte oppføringer?',
+        'export'        => 'Er du sikker på at du vil <b>eksportere</b> valgt oppføring?|Er du sikker på at du vil <b>eksportere</b> valgte oppføringer?',
+        'enable'        => 'Er du sikker på at du vil <b>aktivere</b> valgt oppføring?|Er du sikker på at du vil <b>aktivere</b> valgte oppføringer?',
+        'disable'       => 'Er du sikker på at du vil <b>deaktivere</b> valgt oppføring?|Er du sikker på at du vil <b>deaktivere</b> valgte oppføringer?',
+        'paid'          => 'Er du sikker på at du vil merke valgte faktura som <b>betalt</b>?|Er du sikker på at du vil merke valgte fakturaer som <b>betalt</b>?',
+        'sent'          => 'Er du sikker på at du vil merke valgte faktura som <b>sendt</b>?|Er du sikker på at du vil merke valgte fakturaer som <b>sendt</b>?',
+        'received'      => 'Er du sikker på at du vil merke valgte faktura som <b>mottatt</b>?|Er du sikker på at du vil merke valgte fakturaer som <b>mottatt</b>?',
+    ],
+
+];
diff --git a/resources/lang/nb-NO/companies.php b/resources/lang/nb-NO/companies.php
index c287df324..13f0b4da1 100644
--- a/resources/lang/nb-NO/companies.php
+++ b/resources/lang/nb-NO/companies.php
@@ -4,10 +4,11 @@ return [
 
     'domain'                => 'Domene',
     'logo'                  => 'Logo',
-    'manage'                => 'Administrer foretak',
-    'all'                   => 'Alle foretak',
+
     'error' => [
-        'delete_active'     => 'Feil. Kan ikke slette aktivt foretak, du må bytte først!',
+        'not_user_company'  => 'Feil: Du har ikke tillatelse til å endre dette foretaket!',
+        'delete_active'     => 'Feil: Du kan ikke slette det aktive foretaket. Vennligst velg et annet først!',
+        'disable_active'    => 'Feil: Du kan ikke deaktivere det aktive foretaket. Vennligst velg et annet først!',
     ],
 
 ];
diff --git a/resources/lang/nb-NO/customers.php b/resources/lang/nb-NO/customers.php
index 0855af7ac..d1662b2c4 100644
--- a/resources/lang/nb-NO/customers.php
+++ b/resources/lang/nb-NO/customers.php
@@ -2,15 +2,11 @@
 
 return [
 
-    'allow_login'           => 'Tillat innlogging?',
+    'can_login'             => 'Kan du ikke logge inn?',
     'user_created'          => 'Bruker ble opprettet',
 
     'error' => [
-        'email'             => 'E-postadressen er allerede i bruk.'
+        'email'             => 'E-postadressen er allerede i bruk.',
     ],
 
-    'notification' => [
-        'message'       => ':customer betalte :amount mot faktura :invoice_number.',
-        'button'        => 'Vis',
-    ],
 ];
diff --git a/resources/lang/nb-NO/dashboards.php b/resources/lang/nb-NO/dashboards.php
new file mode 100644
index 000000000..ea9741b9f
--- /dev/null
+++ b/resources/lang/nb-NO/dashboards.php
@@ -0,0 +1,11 @@
+<?php
+
+return [
+
+    'error' => [
+        'not_user_dashboard'    => 'Feil: Du har ikke tillatelse til å endre dette kontrollpanelet!',
+        'delete_last'           => 'Feil: Du kan ikke slette forrige kontrollpanel. Vennligst opprett et nytt først!',
+        'disable_last'          => 'Feil: Du kan ikke deaktivere forrige kontrollpanel. Du må opprette et nytt først!',
+    ],
+
+];
diff --git a/resources/lang/nb-NO/demo.php b/resources/lang/nb-NO/demo.php
index 996ca0090..35a6239b1 100644
--- a/resources/lang/nb-NO/demo.php
+++ b/resources/lang/nb-NO/demo.php
@@ -2,12 +2,33 @@
 
 return [
 
-    'accounts_cash'         => 'Kontanter',
-    'categories_deposit'    => 'Innskudd',
-    'categories_sales'      => 'Salg',
-    'currencies_usd'        => 'Amerikanske Dollar',
-    'currencies_eur'        => 'Euro',
-    'currencies_gbp'        => 'Britiske pund',
-    'currencies_try'        => 'Tyrkiske Lira',
+    'accounts' => [
+        'cash'              => 'Kontanter',
+    ],
+
+    'categories' => [
+        'deposit'           => 'Innskudd',
+        'sales'             => 'Salg',
+    ],
+
+    'currencies' => [
+        'usd'               => 'Amerikanske Dollar',
+        'eur'               => 'Euro',
+        'gbp'               => 'Britiske pund',
+        'try'               => 'Tyrkiske Lira',
+    ],
+
+    'offline_payments' => [
+        'cash'              => 'Kontanter',
+        'bank'              => 'Bankoverføring',
+    ],
+
+    'reports' => [
+        'income'            => 'Månedlig oppsummering av inntekter etter kategori.',
+        'expense'           => 'Månedlig oppsummering av utgifter etter kategori.',
+        'income_expense'    => 'Månedlige inntekter vs utgifter etter kategori.',
+        'tax'               => 'Kvartalsvis avgiftssammendrag.',
+        'profit_loss'       => 'Kvartalsvis fortjeneste & tap etter kategori.',
+    ],
 
 ];
diff --git a/resources/lang/nb-NO/email_templates.php b/resources/lang/nb-NO/email_templates.php
new file mode 100644
index 000000000..cf6d8ba67
--- /dev/null
+++ b/resources/lang/nb-NO/email_templates.php
@@ -0,0 +1,50 @@
+<?php
+
+return [
+
+    'invoice_new_customer' => [
+        'subject'       => 'Faktura {invoice_number} opprettet',
+        'body'          => 'Kjære {customer_name},<br /><br />Vi har opprettet følgende faktura til deg: <strong>{invoice_number}</strong>.<br /><br />Du kan se fakturadetaljene og fortsette med betaling på følgende lenke: <a href="{invoice_guest_link}">{invoice_number}</a>.<br /><br />Vennligst kontakt oss hvis du har spørsmål.<br /><br />Vennlig hilsen,<br />{company_name}',
+    ],
+
+    'invoice_remind_customer' => [
+        'subject'       => '{invoice_number} Fakturapåminnelse',
+        'body'          => 'Kjære {customer_name},<br /><br />Dette er en påminnelse om faktura <strong>{invoice_number}</strong>.<br /><br />Fakturabeløpet er {invoice_total} og forfalte  <strong>{invoice_due_date}</strong>.<br /><br />Du kan se fakturadetaljene og fortsette med betaling på følgende lenke: <a href="{invoice_guest_link}">{invoice_number}</a>.<br /><br />Vennlig hilsen,<br />{company_name}',
+    ],
+
+    'invoice_remind_admin' => [
+        'subject'       => '{invoice_number} Fakturapåminnelse',
+        'body'          => 'Hei,<br /><br />{customer_name} har mottatt en fakturapåminnelse for faktura <strong>{invoice_number}</strong>.<br /><br />Fakturabeløpet er {invoice_total} og forfalt <strong>{invoice_due_date}</strong>.<br /><br />Du kan se fakturadetaljene på følgende lenke: <a href="{invoice_admin_link}">{invoice_number}</a>.<br /><br />Vennlig hilsen,<br />{company_name}',
+    ],
+
+    'invoice_recur_customer' => [
+        'subject'       => '{invoice_number} Gjentakende faktura opprettet',
+        'body'          => 'Kjære {customer_name},<br /><br />Basert på din betalingsordning, har vi opprettet en faktura til deg: <strong>{invoice_number}</strong>.<br /><br />Du kan se fakturadetaljer og fortsette med betaling på følgende lenke: <a href="{invoice_guest_link}">{invoice_number}</a>.<br /><br />Vennligst kontakt oss ved spørsmål.<br /><br />Vennlig hilsen,<br />{company_name}',
+    ],
+
+    'invoice_recur_admin' => [
+        'subject'       => '{invoice_number} Gjentakende faktura opprettet',
+        'body'          => 'Hei,<br /><br />Basert på {customer_name} sin betalingsordning, er faktura <strong>{invoice_number}</strong> automatisk opprettet.<br /><br />Du kan se fakturadetaljer på følgende lenke: <a href="{invoice_admin_link}">{invoice_number}</a>.<br /><br />Vennlig hilsen,<br />{company_name}',
+    ],
+
+    'invoice_payment_customer' => [
+        'subject'       => 'Betaling mottatt for faktura {invoice_number}',
+        'body'          => 'Kjære {customer_name},<br /><br />Takk for betalingen. Finn betalingsdetaljer under:<br /><br />-------------------------------------------------<br />Beløp: <strong>{transaction_total}</strong><br />Dato: <strong>{transaction_paid_date}</strong><br />Fakturanummer: <strong>{invoice_number}</strong><br />-------------------------------------------------<br /><br />Du kan se fakturadetaljene på følgende lenke: <a href="{invoice_guest_link}">{invoice_number}</a>.<br /><br />Vennligst kontakt oss ved spørsmål.<br /><br />Vennlig hilsen,<br />{company_name}',
+    ],
+
+    'invoice_payment_admin' => [
+        'subject'       => 'Betaling mottatt for faktura {invoice_number}',
+        'body'          => 'Hei,<br /><br />{customer_name} registrerte betaling for faktura <strong>{invoice_number}</strong>.<br /><br />Du kan se fakturadetaljene på følgende lenke: <a href="{invoice_admin_link}">{invoice_number}</a>.<br /><br />Vennlig hilsen,<br />{company_name}',
+    ],
+
+    'bill_remind_admin' => [
+        'subject'       => '{bill_number} Betalingspåminnelse',
+        'body'          => 'Hei,<br /><br />Dette er en betalingspåminnelse for faktura <strong>{bill_number}</strong> til {vendor_name}.<br /><br />Fakturabeløpet er {bill_total} og forfalte <strong>{bill_due_date}</strong>.<br /><br />Du kan se fakturadetaljene på følgende lenke: <a href="{bill_admin_link}">{bill_number}</a>.<br /><br />Vennlig hilsen,<br />{company_name}',
+    ],
+
+    'bill_recur_admin' => [
+        'subject'       => '{bill_number} Gjentakende faktura opprettet',
+        'body'          => 'Hei,<br /><br />Basert på {vendor_name} sin betalingsordning for deg, er faktura <strong>{bill_number}</strong> automatisk opprettet.<br /><br />Du kan se fakturadetaljene på følgende lenke: <a href="{bill_admin_link}">{bill_number}</a>.<br /><br />Vennlig hilsen,<br />{company_name}',
+    ],
+
+];
diff --git a/resources/lang/nb-NO/errors.php b/resources/lang/nb-NO/errors.php
index 43e9607ab..478df01b4 100644
--- a/resources/lang/nb-NO/errors.php
+++ b/resources/lang/nb-NO/errors.php
@@ -2,20 +2,22 @@
 
 return [
 
-    'forbidden_access' => 'Ikke tilgang',
-    'error_page'       => 'Feilside',
-    'page_not_found'   => 'Side ikke funnet',
-
-    'body'   => [
-        'forbidden_access' => 'Oops! Ikke tilgang.',
-        'error_page' => 'Oops! Noe gikk galt.',
-        'page_not_found' => 'Oops! Side ikke funnet.',
+    'title' => [
+        '403' => 'Oops! Adgang forbudt',
+        '404' => 'Oops! Side ikke funnet',
+        '500' => 'Oops! Noe gikk galt',
     ],
 
-    'messages'   => [
-        'forbidden_access' => 'Du har ikke tilgang til denne siden. I mellomtiden kan du <a href=":link">returnere til kontrollpanelet</a>.',
-        'error_page' => 'Vi vil arbeide med å ordne dette med en gang. I mellomtiden kan du <a href=":link">returnere til kontrollpanelet</a>.',
-        'page_not_found' => 'Vi kunne ikke finne siden du leter etter. I mellomtiden kan du <a href=":link">returnere til kontrollpanelet</a>.',
+    'header' => [
+        '403' => '403 Forbudt',
+        '404' => '404 Ikke funnet',
+        '500' => '500 Intern serverfeil',
+    ],
+
+    'message' => [
+        '403' => 'Du har ikke adgang til denne siden.',
+        '404' => 'Vi fant ikke siden du lette etter.',
+        '500' => 'VI jobber med å ordne dette med en gang.',
     ],
 
 ];
diff --git a/resources/lang/nb-NO/general.php b/resources/lang/nb-NO/general.php
index e1d11ddb9..824f82754 100644
--- a/resources/lang/nb-NO/general.php
+++ b/resources/lang/nb-NO/general.php
@@ -2,6 +2,7 @@
 
 return [
 
+    'dashboards'            => 'Kontrollpanel|Kontrollpaneler',
     'items'                 => 'Artikkel | Artikler',
     'incomes'               => 'Inntekt | Inntekter',
     'invoices'              => 'Faktura | Fakturaer',
@@ -41,8 +42,17 @@ return [
     'contacts'              => 'Kontakt|Kontakter',
     'reconciliations'       => 'Avstemming|Avstemminger',
     'developers'            => 'Utvikler|Utviklere',
+    'schedules'             => 'Tidsplan|Tidsplaner',
+    'groups'                => 'Gruppe|Grupper',
+    'charts'                => 'Diagram|Diagrammer',
+    'localisations'         => 'Lokalisering|Lokaliseringer',
+    'defaults'              => 'Standard|Standarder',
+    'widgets'               => 'Widget|Widgeter',
+    'templates'             => 'Mal|Maler',
+    'sales'                 => 'Salg|Salg',
+    'purchases'             => 'Kjøp|Kjøp',
 
-    'dashboard'             => 'Kontrollpanel',
+    'welcome'               => 'Velkommen',
     'banking'               => 'Bank',
     'general'               => 'Generelt',
     'no_records'            => 'Ingen oppføringer.',
@@ -54,15 +64,19 @@ return [
     'no'                    => 'Nei',
     'na'                    => 'Ikke tilgjengelig',
     'daily'                 => 'Daglig',
+    'weekly'                => 'Ukentlig',
     'monthly'               => 'Månedlig',
     'quarterly'             => 'Kvartalsvis',
     'yearly'                => 'Årlig',
     'add'                   => 'Legg til',
     'add_new'               => 'Legg til ny',
+    'add_income'            => 'Legg til inntekt',
+    'add_expense'           => 'Legg til utgift',
     'show'                  => 'Vis',
     'edit'                  => 'Endre',
     'delete'                => 'Slett',
     'send'                  => 'Send',
+    'share'                 => 'Del',
     'download'              => 'Last ned',
     'delete_confirm'        => 'Bekreft sletting av :name :type?',
     'name'                  => 'Navn',
@@ -80,9 +94,11 @@ return [
     'reference'             => 'Referanse',
     'attachment'            => 'Vedlegg',
     'change'                => 'Endre',
+    'change_type'           => 'Endre :type',
     'switch'                => 'Bytt',
     'color'                 => 'Farge',
     'save'                  => 'Lagre',
+    'confirm'               => 'Bekreft',
     'cancel'                => 'Avbryt',
     'loading'               => 'Laster...',
     'from'                  => 'Fra',
@@ -112,20 +128,47 @@ return [
     'disable'               => 'Deaktiver',
     'select_all'            => 'Velg alle',
     'unselect_all'          => 'Velg ingen',
-    'go_to'                 => 'Gå til :name',
     'created_date'          => 'Opprettet dato',
     'period'                => 'Periode',
+    'frequency'             => 'Frekvens',
     'start'                 => 'Start',
     'end'                   => 'Slutt',
     'clear'                 => 'Nullstill',
     'difference'            => 'Forskjell',
+    'footer'                => 'Bunntekst',
+    'start_date'            => 'Startdato',
+    'end_date'              => 'Sluttdato',
+    'basis'                 => 'Grunnlag',
+    'accrual'               => 'Periodisering',
+    'cash'                  => 'Kontanter',
+    'group_by'              => 'Grupper etter',
+    'accounting'            => 'Regnskap',
+    'sort'                  => 'Sortér',
+    'width'                 => 'Bredde',
+    'month'                 => 'Måned',
+    'year'                  => 'År',
+    'type_item_name'        => 'Skriv et artikkelnavn',
+    'no_data'               => 'Ingen data',
+    'no_matching_data'      => 'Fant ingen samsvarende data',
+    'clear_cache'           => 'Tøm hurtiglager',
+    'go_to_dashboard'       => 'Gå til kontrollpanel',
+
+    'card' => [
+        'name'                  => 'Navn på kort',
+        'number'                => 'Kortnummer',
+        'expiration_date'       => 'Utløpsdato',
+        'cvv'                   => 'CVC',
+    ],
 
     'title' => [
         'new'               => 'Ny :type',
         'edit'              => 'Endre :type',
+        'delete'            => 'Slett :type',
         'create'            => 'Opprett :type',
         'send'              => 'Send :type',
         'get'               => 'Motta :type',
+        'add'               => 'Legg til :type',
+        'manage'            => 'Behandle :type',
     ],
 
     'form' => [
@@ -134,6 +177,7 @@ return [
             'field'         => '-Velg :field -',
             'file'          => 'Velg fil',
         ],
+        'add_new'           => 'Legg til ny :field',
         'no_file_selected'  => 'Ingen fil valgt ...',
     ],
 
@@ -144,4 +188,19 @@ return [
         'this_month' => 'Denne måneden',
         'last_month' => 'Forrige måned',
     ],
+
+    'empty' => [
+        'documentation' => 'Les <a href=":url" target="_blank">dokumentasjonen</a> for mer detaljer.',
+        'items' => 'Artikler kan være produkter eller tjenester. Du kan bruke artiklene når du oppretter fakturaer for å ha fastsatte priser og avgifter.',
+        'invoices' => 'Fakturaer kan være engangs- eller gjentakende. Du kan sende dem til kunder og starte online betalinger.',
+        'revenues' => 'Fortjeneste er en betalt inntektstransaksjon. Det kan være en uavhengig oppføring (f.eks innbetaling) eller knyttet til en faktura.',
+        'customers' => 'Kunder er obligatorisk hvis du vil opprette fakturaer. De kan også logge på kundeportal for å se deres balanse mot ditt foretak.',
+        'bills' => 'Fakturaer kan være engangs- eller gjentakende. De indikerer hva du skylder dine leverandører for produkter og tjenester du kjøper.',
+        'payments' => 'Betaling er en betalt utgiftstransaksjon. Det kan være en uavhengig oppføring (f.eks mot kvittering) eller knyttet til en innkommende faktura.',
+        'vendors' => 'Leverandører er obligatorisk hvis du vil opprette innkommende fakturaer. Du kan se balansen og filtrere rapporter mot leverandør',
+        'transfers' => 'Overføring lar deg flytte penger fra en konto til en annen, uavhengig om de benytter samme valuta eller ikke.',
+        'taxes' => 'Avgifter er brukt til å legge på ekstra avgifter på fakturaer. Din finans er påvirket av disse regulerte avgiftene.',
+        'reconciliations' => 'Bankavstemming er en prosess som utføres for å forsikre at dine bankkontooppføringer stemmer med regnskap.',
+    ],
+
 ];
diff --git a/resources/lang/nb-NO/header.php b/resources/lang/nb-NO/header.php
index 2e881b5d7..39fcd7a35 100644
--- a/resources/lang/nb-NO/header.php
+++ b/resources/lang/nb-NO/header.php
@@ -8,9 +8,9 @@ return [
         'counter'           => '{0} Du har ingen varsel |{1} Du har :count varsler|[2,*] Du har :count varsler',
         'overdue_invoices'  => '{1} :count forfalt faktura|[2,*] :count forfalte fakturaer',
         'upcoming_bills'    => '{1} :count kommende faktura [2,*] :count kommende fakturaer',
-        'items_stock'       => '{1} :count utsolgt artikkel|[2,*] :count utsolgte artikler',
         'view_all'          => 'Vis alle'
     ],
     'docs_link'             => 'https://akaunting.com/docs',
+    'support_link'          => 'https://akaunting.com/support',
 
 ];
diff --git a/resources/lang/nb-NO/invoices.php b/resources/lang/nb-NO/invoices.php
index 6d1e8bc02..84dcfa9a2 100644
--- a/resources/lang/nb-NO/invoices.php
+++ b/resources/lang/nb-NO/invoices.php
@@ -29,6 +29,7 @@ return [
     'add_payment'           => 'Legg til betaling',
     'mark_paid'             => 'Merk som betalt',
     'mark_sent'             => 'Merk som sendt',
+    'mark_viewed'           => 'Merk som sett',
     'download_pdf'          => 'Last ned PDF',
     'send_mail'             => 'Send e-post',
     'all_invoices'          => 'Logg inn for å se alle fakturaer',
@@ -38,22 +39,26 @@ return [
     'accept_payments'       => 'Aksepter online betalinger',
 
     'statuses' => [
-        'draft'             => 'Utkast',
+        'draft'             => 'Kladd',
         'sent'              => 'Sendt',
-        'viewed'            => 'Åpnet',
+        'viewed'            => 'Sett',
         'approved'          => 'Godkjent',
         'partial'           => 'Delvis',
         'paid'              => 'Betalt',
+        'overdue'           => 'Forfalt',
+        'unpaid'            => 'Ubetalt',
     ],
 
     'messages' => [
-        'email_sent'        => 'E-post med faktura har blitt sendt.',
-        'marked_sent'       => 'Faktura merket som sendt.',
+        'email_sent'        => 'Faktura e-post er blitt sendt!',
+        'marked_sent'       => 'Faktura merket som sendt!',
+        'marked_paid'       => 'Faktura merket som betalt!',
         'email_required'    => 'E-postadresse må fylles inn.',
         'draft'             => 'Dette er en <b>KLADD</b> for fakturaen som vil bli oppdatert etter at den er sendt.',
 
         'status' => [
             'created'       => 'Opprettet :date',
+            'viewed'        => 'Sett',
             'send' => [
                 'draft'     => 'Ikke sendt',
                 'sent'      => 'Sendt :date',
@@ -64,9 +69,4 @@ return [
         ],
     ],
 
-    'notification' => [
-        'message'           => 'Du mottar denne e-posten med faktura til :customer, pålydende :amount.',
-        'button'            => 'Betal nå',
-    ],
-
 ];
diff --git a/resources/lang/nb-NO/items.php b/resources/lang/nb-NO/items.php
index 027f6148d..14551f987 100644
--- a/resources/lang/nb-NO/items.php
+++ b/resources/lang/nb-NO/items.php
@@ -2,17 +2,7 @@
 
 return [
 
-    'quantities'            => 'Antall | Antall',
     'sales_price'           => 'Utsalgspris',
     'purchase_price'        => 'Innkjøpspris',
-    'sku'                   => 'Varenummer (SKU)',
-
-    'notification' => [
-        'message'       => [
-            'reminder' => 'Du mottar denne e-posten fordi det kun er :quantity av :name igjen.',
-            'out_of_stock' => 'Du mottar denne e-posten fordi :name er nesten tom på lager.',
-        ],
-        'button'        => 'Vis nå',
-    ],
 
 ];
diff --git a/resources/lang/nb-NO/maintenance.php b/resources/lang/nb-NO/maintenance.php
new file mode 100644
index 000000000..db661eec6
--- /dev/null
+++ b/resources/lang/nb-NO/maintenance.php
@@ -0,0 +1,11 @@
+<?php
+
+return [
+
+    'title' => 'Under vedlikehold',
+
+    'message' => 'Beklager, men vi er nede for vedlikehold. Vennligst prøv igjen senere!',
+
+    'last-updated' => 'Denne meldingen var sist oppdatert :timestamp.',
+
+];
diff --git a/resources/lang/nb-NO/messages.php b/resources/lang/nb-NO/messages.php
index 12ae984ed..62445c8ef 100644
--- a/resources/lang/nb-NO/messages.php
+++ b/resources/lang/nb-NO/messages.php
@@ -8,6 +8,7 @@ return [
         'deleted'           => ':type slettet.',
         'duplicated'        => ':type duplisert.',
         'imported'          => ':type importert.',
+        'exported'          => ':type eksportert!',
         'enabled'           => ':type aktivert!',
         'disabled'          => ':type deaktivert!',
     ],
@@ -18,7 +19,8 @@ return [
         'customer'          => 'Feil: Bruker ble ikke opprettet. :name bruker allerede denne e-postadressen.',
         'no_file'           => 'Feil: Ingen fil er valgt.',
         'last_category'     => 'Feil: Kan ikke slette siste :type kategori.',
-        'invalid_apikey'     => 'Feil: Angitt token er ugyldig.',
+        'change_type'       => 'Feil: Du kan ikke endre denne typen fordi den har relatert :text!',
+        'invalid_apikey'    => 'Feil: API nøkkelen du har skrevet er feil!',
         'import_column'     => 'Feil: :message Arknavn: :sheet. Linjenummer: :line.',
         'import_sheet'      => 'Feil: Arknavn er ikke gyldig. Vennligst sjekk malfilen.',
     ],
@@ -27,6 +29,7 @@ return [
         'deleted'           => 'Advarsel: Du har ikke mulighet til å slette <b>:name</b> fordi kontoen har :text relatert.',
         'disabled'          => 'Advarsel: Du kan ikke deaktivere <b>:name</b> fordi kontoen har :text relatert.',
         'disable_code'      => 'Advarsel: Du har ikke tillatelse til å deaktivere eller endre valutaen for <b>:name</b> fordi den har relatert :text.',
+        'payment_cancel'    => 'Advarsel: Du har avbrutt din siste :method betaling!',
     ],
 
 ];
diff --git a/resources/lang/nb-NO/modules.php b/resources/lang/nb-NO/modules.php
index 076062352..7cd6af7f5 100644
--- a/resources/lang/nb-NO/modules.php
+++ b/resources/lang/nb-NO/modules.php
@@ -2,8 +2,7 @@
 
 return [
 
-    'title'                 => 'API-token',
-    'api_token'             => 'Token',
+    'api_key'               => 'API nøkkel',
     'my_apps'               => 'Mine applikasjoner',
     'pre_sale'              => 'Forhåndssalg',
     'top_paid'              => 'Topp betalte',
@@ -13,10 +12,9 @@ return [
     'search'                => 'Søk',
     'install'               => 'Installer',
     'buy_now'               => 'Kjøp nå',
-    'token_link'            => '<a href="https://akaunting.com/tokens" target="_blank">Klikk her</a> for å få din API-token.',
+    'get_api_key'           => '<a href=":url" target="_blank">Klikk her</a> for å motta din API nøkkel.',
     'no_apps'               => 'Det er ingen applikasjoner i denne kategorien ennå.',
-    'developer'             => 'Er du en utvikler? <a href="https://akaunting.com/blog/akaunting-app-store" target="_blank">Her</a> kan du lære hvordan du lager en applikasjon for salg.',
-
+    'become_developer'      => 'Er du en utvikler? <a href=":url" target="_blank">Her</a> kan du lære hvordan du kan opprette en applikasjon og starte salg i dag!',
     'recommended_apps'      => 'Anbefalte applikasjoner',
 
     'about'                 => 'Om',
@@ -38,31 +36,30 @@ return [
         'installation'      => 'Installering',
         'faq'               => 'FAQ',
         'changelog'         => 'Endringslogg',
-        'reviews'            => 'Anmeldelser',
+        'reviews'           => 'Anmeldelser',
     ],
 
     'installation' => [
         'header'            => 'Applikasjonsinstallering',
-        'download'          => 'Laster ned :module.',
-        'unzip'             => 'Pakker ut :module.',
-        'file_copy'         => 'Kopierer filer til :module.',
-        'migrate'           => 'Legger til :module oppdateringer.',
-        'finish'            => 'Oppdateringen ble installert. Du vil bli videresendt til Oppdateringssenter.',
-        'install'           => 'Installerer :module.',
+        'download'          => 'Laster ned :module',
+        'unzip'             => 'Pakker ut filer til :module',
+        'file_copy'         => 'Kopierer filer til :module',
+        'finish'            => 'Ferdigstiller installasjon av :module',
+        'redirect'          => ':module installert. Du sendes videre til oppdateringsside',
+        'install'           => 'Installerer :module',
     ],
 
     'errors' => [
-        'download' => ':module kan ikke lastes ned!',
-        'upload' => 'Nedlastet :module kan ikke lagres!',
-        'unzip' => ':module kan ikke pakkes ut!',
-        'file_copy' => ':module filer kan ikke kopieres!',
-        'migrate' => ':module migrasjon mislykket!',
-        'migrate core' => ':module er allerede siste versjon, så du kan ikke oppdatere.',
+        'download'          => 'Ikke mulig å laste ned :module',
+        'zip'               => 'Ikke mulig å opprette zip-fil til :module',
+        'unzip'             => 'Ikke mulig å pakke ut :module',
+        'file_copy'         => 'Ikke mulig å kopiere filer til :module',
+        'finish'            => 'Ikke mulig å ferdigstille installasjon av :module',
     ],
 
     'badge' => [
-        'installed' => 'Innstallert',
-        'pre_sale' => 'Forhåndssalg',
+        'installed'         => 'Innstallert',
+        'pre_sale'          => 'Forhåndssalg',
     ],
 
     'button' => [
@@ -72,14 +69,16 @@ return [
     ],
 
     'my' => [
-        'purchased' => 'Kjøpt',
-        'installed' => 'Installert',
+        'purchased'         => 'Kjøpt',
+        'installed'         => 'Installert',
     ],
 
     'reviews' => [
         'button' => [
-            'add' => 'Legg til anmeldelse'
+            'add'           => 'Legg til anmeldelse'
         ],
-        'na' => 'Det er ingen anmeldelser.'
-    ]
+
+        'na'                => 'Det er ingen anmeldelser.'
+    ],
+
 ];
diff --git a/resources/lang/nb-NO/pagination.php b/resources/lang/nb-NO/pagination.php
index a633bbeec..f352a3f3b 100644
--- a/resources/lang/nb-NO/pagination.php
+++ b/resources/lang/nb-NO/pagination.php
@@ -2,8 +2,9 @@
 
 return [
 
-    'previous'              => '&laquo; Forrige',
-    'next'                  => 'Neste &raquo;',
-    'showing'               => 'Viser :first til :last av :total :type',
+    'previous'              => 'Forrige',
+    'next'                  => 'Neste',
+    'showing'               => ':first-:last av :total oppføringer.',
+    'page'                  => 'per side.',
 
 ];
diff --git a/resources/lang/nb-NO/reconciliations.php b/resources/lang/nb-NO/reconciliations.php
index e42327236..43636cdb9 100644
--- a/resources/lang/nb-NO/reconciliations.php
+++ b/resources/lang/nb-NO/reconciliations.php
@@ -6,7 +6,7 @@ return [
     'reconciled'            => 'Avstemt',
     'closing_balance'       => 'Sluttbalanse',
     'unreconciled'          => 'Uavstemt',
-    'list_transactions'     => 'Vis transaksjoner',
+    'transactions'          => 'Transaksjoner',
     'start_date'            => 'Startdato',
     'end_date'              => 'Sluttdato',
     'cleared_amount'        => 'Klarert beløp',
diff --git a/resources/lang/nb-NO/reports.php b/resources/lang/nb-NO/reports.php
index 9361d06f4..b7fbc0591 100644
--- a/resources/lang/nb-NO/reports.php
+++ b/resources/lang/nb-NO/reports.php
@@ -12,6 +12,7 @@ return [
     'net_profit'            => 'Nettoresultat',
     'total_expenses'        => 'Totale utgifter',
     'net'                   => 'NET',
+    'income_expense'        => 'Inntekter og utgifter',
 
     'summary' => [
         'income'            => 'Inntektsammendrag',
@@ -20,11 +21,10 @@ return [
         'tax'               => 'Avgiftsammendrag',
     ],
 
-    'quarter' => [
-        '1'                 => 'Jan.-Mars',
-        '2'                 => 'April-Juni',
-        '3'                 => 'Juli-Sep.',
-        '4'                 => 'Okt.-Des.',
+    'charts' => [
+        'line'              => 'Linje',
+        'bar'               => 'Kolonne',
+        'pie'               => 'Pai',
     ],
 
 ];
diff --git a/resources/lang/nb-NO/settings.php b/resources/lang/nb-NO/settings.php
index 436793948..f41cd0f1c 100644
--- a/resources/lang/nb-NO/settings.php
+++ b/resources/lang/nb-NO/settings.php
@@ -3,14 +3,16 @@
 return [
 
     'company' => [
+        'description'       => 'Endre bedriftsnavn, e-post, adresse, momsavgifter mm',
         'name'              => 'Navn',
         'email'             => 'E-post',
         'phone'             => 'Telefon',
         'address'           => 'Adresse',
         'logo'              => 'Logo',
     ],
+
     'localisation' => [
-        'tab'               => 'Lokalisering',
+        'description'       => 'Sett regnskapsår, tidssone, datoformat og mer',
         'financial_start'   => 'Start på regnskapsår',
         'timezone'          => 'Tidssone',
         'date' => [
@@ -28,8 +30,9 @@ return [
             'after'         => 'Etter nummer',
         ],
     ],
+
     'invoice' => [
-        'tab'               => 'Faktura',
+        'description'       => 'Tilpass fakturaprefiks, nummer, vilkår, bunntekst mm',
         'prefix'            => 'Nummerprefiks',
         'digit'             => 'Antall siffer',
         'next'              => 'Neste nummer',
@@ -44,16 +47,25 @@ return [
         'rate'              => 'Sats',
         'quantity_name'     => 'Kvantitetsnavn',
         'quantity'          => 'Kvantitet',
+        'payment_terms'     => 'Betalingsvilkår',
+        'title'             => 'Tittel',
+        'subheading'        => 'Underoverskrift',
+        'due_receipt'       => 'Forfall ved mottak',
+        'due_days'          => 'Forfall innen :days dager',
+        'choose_template'   => 'Velg fakturamal',
+        'default'           => 'Standard',
+        'classic'           => 'Klassisk',
+        'modern'            => 'Moderne',
     ],
+
     'default' => [
-        'tab'               => 'Standardinnstilinger',
-        'account'           => 'Standard konto',
-        'currency'          => 'Standard valuta',
-        'tax'               => 'Standard avgiftssats',
-        'payment'           => 'Standard betalingsmåte',
-        'language'          => 'Standard språk',
+        'description'       => 'Standard konto, valuta, språk for ditt foretak',
+        'list_limit'        => 'Oppføringer per side',
+        'use_gravatar'      => 'Bruk Gravatar',
     ],
+
     'email' => [
+        'description'       => 'Endre sendingsprotokoll og e-postmaler',
         'protocol'          => 'Protokoll',
         'php'               => 'PHP Mail',
         'smtp' => [
@@ -68,36 +80,44 @@ return [
         'sendmail'          => 'Sendmail',
         'sendmail_path'     => 'Sti for Sendmail',
         'log'               => 'Logg e-post',
+
+        'templates' => [
+            'subject'                   => 'Emne',
+            'body'                      => 'Hoveddel',
+            'tags'                      => '<strong>Tilgjengelige tagger:</strong> :tag_list',
+            'invoice_new_customer'      => 'Ny fakturamal (sendt til kunde)',
+            'invoice_remind_customer'   => 'Fakturapåminnelsesmal (sendt til kunde)',
+            'invoice_remind_admin'      => 'Fakturapåminnelsesmal (sendt til admin)',
+            'invoice_recur_customer'    => 'Gjentagende fakturamal (sendt til kunde)',
+            'invoice_recur_admin'       => 'Gjentagende fakturamal (sendt til admin)',
+            'invoice_payment_customer'  => 'Mottatt betalingsmal (sendt til kunde)',
+            'invoice_payment_admin'     => 'Mottatt betalingsmal (sendt til admin)',
+            'bill_remind_admin'         => 'Fakturapåminnelsesmal (sendt til admin)',
+            'bill_recur_admin'          => 'Gjentagende fakturamal (sendt til admin)',
+        ],
     ],
+
     'scheduling' => [
-        'tab'               => 'Tidsplan',
+        'name'              => 'Tidsplan',
+        'description'       => 'Automatiske påminnelser og kommandoer for gjentakende aktiviteter',
         'send_invoice'      => 'Send fakturapåminnelse',
         'invoice_days'      => 'Antall dager etter forfall for utsending',
         'send_bill'         => 'Send fakturapåminnelse',
         'bill_days'         => 'Antall dager før forfall for utsending',
         'cron_command'      => 'Cron-kommando',
         'schedule_time'     => 'Tid for kjøring',
-        'send_item_reminder'=> 'Send artikkelpåminnelse',
-        'item_stocks'       => 'Send en lagerpåminnelse',
     ],
-    'appearance' => [
-        'tab'               => 'Utseende',
-        'theme'             => 'Tema',
-        'light'             => 'Lys',
-        'dark'              => 'Mørk',
-        'list_limit'        => 'Oppføringer per side',
-        'use_gravatar'      => 'Bruk Gravatar',
+
+    'categories' => [
+        'description'       => 'Kategorier for inntekter, utgifter og artikler',
     ],
-    'system' => [
-        'tab'               => 'System',
-        'session' => [
-            'lifetime'      => 'Øktlevetid (minutter)',
-            'handler'       => 'Øktbehandler',
-            'file'          => 'Fil',
-            'database'      => 'Database',
-        ],
-        'file_size'         => 'Maks fil størrelse (MB)',
-        'file_types'        => 'Tillatte filtyper',
+
+    'currencies' => [
+        'description'       => 'Opprette og behandle valuta',
+    ],
+
+    'taxes' => [
+        'description'       => 'Faste, normale, inklusive og forbundne avgifter',
     ],
 
 ];
diff --git a/resources/lang/nb-NO/taxes.php b/resources/lang/nb-NO/taxes.php
index 7ef0cceac..13f260603 100644
--- a/resources/lang/nb-NO/taxes.php
+++ b/resources/lang/nb-NO/taxes.php
@@ -7,5 +7,5 @@ return [
     'normal'                => 'Normal',
     'inclusive'             => 'Inklusiv',
     'compound'              => 'Tillegg',
-
+    'fixed'                 => 'Fastsatt',
 ];
diff --git a/resources/lang/nb-NO/validation.php b/resources/lang/nb-NO/validation.php
index 48ed1e6fc..125ef978b 100644
--- a/resources/lang/nb-NO/validation.php
+++ b/resources/lang/nb-NO/validation.php
@@ -33,15 +33,16 @@ return [
     'confirmed'            => 'Bekreftelsen for :attribute samsvarer ikke.',
     'date'                 => ':attribute er ikke en gyldig dato.',
     'date_format'          => ':attribute samsvarer ikke med formatet :format.',
-    'different'            => ':attribute og :other må være forskjellige.',
+    'different'            => ':attribute og :other må være forskellige.',
     'digits'               => ':attribute må inneholde :digits sifre.',
     'digits_between'       => ':attribute må inneholde mellom :min og :max sifre.',
     'dimensions'           => ':attribute har feil bildedimensjoner.',
     'distinct'             => ':attribute feltet har en duplisert verdi.',
     'email'                => ':attribute må være en gyldig e-postadresse.',
+    'ends_with'            => ':attribute må slutte på en av de følgende: :values',
     'exists'               => 'Det valgte :attribute er ugyldig.',
     'file'                 => ':attribute må være en fil.',
-    'filled'               => 'Feltet for :attribute må fylles ut.',
+    'filled'               => ':attribute må fylles ut.',
     'image'                => ':attribute må være et bilde.',
     'in'                   => 'Valgt :attribute er ugyldig.',
     'in_array'             => ':attribute felt eksisterer ikke i :other.',
@@ -64,9 +65,9 @@ return [
     ],
     'not_in'               => 'Valgt :attribute er ugyldig.',
     'numeric'              => ':attribute må være et nummer.',
-    'present'              => 'Feltet :attribute må være tilstede.',
+    'present'              => ':attribute må eksistere.',
     'regex'                => 'Formatet på :attribute er ugyldig.',
-    'required'             => 'Feltet :attribute må fylles ut.',
+    'required'             => ':attribute må fylles ut.',
     'required_if'          => 'Feltet :attribute må fylles ut når :other er :value.',
     'required_unless'      => 'Feltet :attribute er påkrevd med mindre :other finnes blant verdiene :values.',
     'required_with'        => 'Feltet :attribute må fylles ut når :values er utfylt.',
@@ -77,13 +78,13 @@ return [
     'size'                 => [
         'numeric' => ':attribute må være :size.',
         'file'    => ':attribute må være :size kilobytes.',
-        'string'  => ':attribute må inneholde :size tegn.',
+        'string'  => ':attribute må være :size tegn lang.',
         'array'   => ':attribute må inneholde :size elementer.',
     ],
     'string'               => ':attribute må være en tekststreng.',
     'timezone'             => ':attribute må være en gyldig sone.',
     'unique'               => ':attribute er allerede i bruk.',
-    'uploaded'             => ':attribute feilet under opplastingen.',
+    'uploaded'             => ':attribute kunne ikke lastes opp.',
     'url'                  => 'Formatet på :attribute er ugyldig.',
 
     /*
diff --git a/resources/lang/nb-NO/dashboard.php b/resources/lang/nb-NO/widgets.php
similarity index 50%
rename from resources/lang/nb-NO/dashboard.php
rename to resources/lang/nb-NO/widgets.php
index 84e8b3418..326c0ba4f 100644
--- a/resources/lang/nb-NO/dashboard.php
+++ b/resources/lang/nb-NO/widgets.php
@@ -2,23 +2,22 @@
 
 return [
 
-    'total_incomes'             => 'Totale inntekter',
+    'total_income'              => 'Total inntekt',
     'receivables'               => 'Fordringer',
     'open_invoices'             => 'Ubetalte fakturaer',
     'overdue_invoices'          => 'Forfalte fakturaer',
     'total_expenses'            => 'Totale utgifter',
-    'payables'                  => 'Leverandørgjeld',
-    'open_bills'                => 'Ubetalte faktura',
-    'overdue_bills'             => 'Forfalte faktura',
-    'total_profit'              => 'Samlet fortjeneste',
-    'open_profit'               => 'Åpen fortjeneste',
+    'payables'                  => 'Fordringer',
+    'open_bills'                => 'Ubetalte fakturaer',
+    'overdue_bills'             => 'Forfalte fakturaer',
+    'total_profit'              => 'Total fortjeneste',
+    'open_profit'               => 'Ubetalt fortjeneste',
     'overdue_profit'            => 'Forfalt fortjeneste',
     'cash_flow'                 => 'Kontantstrøm',
-    'no_profit_loss'            => 'Ingen fortjenestetap',
-    'incomes_by_category'       => 'Inntekter etter kategori',
+    'no_profit_loss'            => 'Ingen fortjenestestap',
+    'income_by_category'        => 'Inntekt etter kategori',
     'expenses_by_category'      => 'Utgifter etter kategori',
     'account_balance'           => 'Kontobalanse',
-    'latest_incomes'            => 'Siste inntekter',
+    'latest_income'             => 'Siste inntekter',
     'latest_expenses'           => 'Siste utgifter',
-
 ];
diff --git a/resources/lang/tr-TR/email_templates.php b/resources/lang/tr-TR/email_templates.php
index 34b3babaa..f3cbb6452 100644
--- a/resources/lang/tr-TR/email_templates.php
+++ b/resources/lang/tr-TR/email_templates.php
@@ -39,7 +39,7 @@ return [
 
     'bill_remind_admin' => [
         'subject'       => '{bill_number} gider faturası için ödeme hatırlatması',
-        'body'          => 'Merhaba,<br /><br /><strong>{vendor_name} tedarikçinize {bill_number}</strong> numaralı gider faturası için ödeme hatırlatmasıdır.<br /><br />Faturanın tutarı {bill_total} ve son ödemesi <strong>{bill_due_date}</strong> tarhinde yapılması gerekir.<br /><br />Aşağıdaki bağlantıdan faturanın detaylarına ulaşabilirsiniz: <a href="{bill_admin_link}">{bill_number}</a>.<br /><br />Kolay gelsin,<br />{company_name}',
+        'body'          => 'Merhaba,<br /><br /><strong>{vendor_name}</strong> tedarikçinize <strong>{bill_number}</strong> numaralı gider faturası için ödeme hatırlatmasıdır.<br /><br />Faturanın tutarı {bill_total} ve son ödemesi <strong>{bill_due_date}</strong> tarhinde yapılması gerekir.<br /><br />Aşağıdaki bağlantıdan faturanın detaylarına ulaşabilirsiniz: <a href="{bill_admin_link}">{bill_number}</a>.<br /><br />Kolay gelsin,<br />{company_name}',
     ],
 
     'bill_recur_admin' => [

From 7adcadcff894ee82b2b7d7c8d3ee58b5b530cbb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Sat, 7 Mar 2020 16:17:24 +0300
Subject: [PATCH 19/65] Selectbox addnew style changes.

---
 .../assets/js/components/AkauntingSelect.vue  |  14 ++-
 .../js/components/AkauntingSelectRemote.vue   | 107 ++++++++++++++++--
 2 files changed, 109 insertions(+), 12 deletions(-)

diff --git a/resources/assets/js/components/AkauntingSelect.vue b/resources/assets/js/components/AkauntingSelect.vue
index 15c0aea31..92d4d09c7 100644
--- a/resources/assets/js/components/AkauntingSelect.vue
+++ b/resources/assets/js/components/AkauntingSelect.vue
@@ -570,7 +570,7 @@ export default {
         onModal(value) {
             let add_new = this.add_new;
 
-            axios.get(this.add_new.path)
+            window.axios.get(this.add_new.path)
             .then(response => {
                 add_new.show = true;
                 add_new.html = response.data.html;
@@ -625,7 +625,7 @@ export default {
 
             let data = this.form.data();
 
-            FormData.prototype.appendRecursive = function(data, wrapper = null) {  
+            FormData.prototype.appendRecursive = function(data, wrapper = null) {
                 for(var name in data) {
                     if (wrapper) {
                         if ((typeof data[name] == 'object' || data[name].constructor === Array) && ((data[name] instanceof File != true ) && (data[name] instanceof Blob != true))) {
@@ -661,7 +661,7 @@ export default {
 
                 if (response.data.success) {
                     this.selectOptions[response.data.data.id] = response.data.data['name'];
-                    this.new_options[response.data.data.id] = response.data.data.id;
+                    this.new_options[response.data.data.id] = response.data.data['name'];
                     this.real_model = response.data.data.id.toString();
 
                     this.change();
@@ -696,6 +696,14 @@ export default {
         options: function (options) {
             // update options
             this.selectOptions = options;
+
+            if (Object.keys(this.new_options).length) {
+                for (let [key, value] of Object.entries(this.new_options)) {
+                    if (!this.selectOptions[key]) {
+                        this.selectOptions[key] = value;
+                    }
+                }
+            }
         },
 
         value: function (value) {
diff --git a/resources/assets/js/components/AkauntingSelectRemote.vue b/resources/assets/js/components/AkauntingSelectRemote.vue
index 71ce64f14..7d66a1765 100644
--- a/resources/assets/js/components/AkauntingSelectRemote.vue
+++ b/resources/assets/js/components/AkauntingSelectRemote.vue
@@ -1,5 +1,16 @@
 <template>
-    <base-input v-if="title" :label="title" :name="name" :class="formClasses" :error="formError">
+    <base-input
+        v-if="title"
+        :label="title"
+        :name="name"
+        :readonly="readonly"
+        :disabled="disabled"
+        :class="[
+            {'readonly': readonly},
+            {'disabled': disabled},
+            formClasses
+        ]"
+        :error="formError">
         <el-select v-model="real_model" @input="change" disabled filterable v-if="disabled"
             :placeholder="placeholder">
             <div v-if="addNew.status && options.length != 0" class="el-select-dropdown__wrap" slot="empty">
@@ -44,6 +55,8 @@
                :key="value"
                :label="label"
                :value="value">
+                <span class="float-left">{{ label }}</span>
+                <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
             </el-option>
 
             <el-option-group
@@ -56,6 +69,8 @@
                     :key="value"
                     :label="label"
                     :value="value">
+                    <span class="float-left">{{ label }}</span>
+                    <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
                 </el-option>
             </el-option-group>
 
@@ -113,6 +128,8 @@
                :key="value"
                :label="label"
                :value="value">
+                <span class="float-left">{{ label }}</span>
+                <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
             </el-option>
 
             <el-option-group
@@ -125,6 +142,8 @@
                     :key="value"
                     :label="label"
                     :value="value">
+                    <span class="float-left">{{ label }}</span>
+                    <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
                 </el-option>
             </el-option-group>
 
@@ -182,6 +201,8 @@
                :key="value"
                :label="label"
                :value="value">
+                <span class="float-left">{{ label }}</span>
+                <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
             </el-option>
 
             <el-option-group
@@ -194,6 +215,8 @@
                     :key="value"
                     :label="label"
                     :value="value">
+                    <span class="float-left">{{ label }}</span>
+                    <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
                 </el-option>
             </el-option-group>
 
@@ -251,6 +274,8 @@
                :key="value"
                :label="label"
                :value="value">
+                <span class="float-left">{{ label }}</span>
+                <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
             </el-option>
 
             <el-option-group
@@ -263,6 +288,8 @@
                     :key="value"
                     :label="label"
                     :value="value">
+                    <span class="float-left">{{ label }}</span>
+                    <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
                 </el-option>
             </el-option-group>
 
@@ -281,6 +308,8 @@
         <select :name="name" class="d-none" v-model="real_model">
             <option v-for="(label, value) in selectOptions" :value="value">{{ label }}</option>
         </select>
+
+        <span slot="infoBlock" class="badge badge-success badge-resize float-right" v-if="new_options[real_model]">{{ new_text }}</span>
     </base-input>
 
     <el-select v-else
@@ -341,6 +370,8 @@
                :key="option.id"
                :label="option.name"
                :value="option.id">
+                <span class="float-left">{{ label }}</span>
+                <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span
             </el-option>
 
             <el-option-group
@@ -353,6 +384,8 @@
                     :key="value"
                     :label="label"
                     :value="value">
+                    <span class="float-left">{{ label }}</span>
+                    <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
                 </el-option>
             </el-option-group>
 
@@ -364,6 +397,8 @@
                     </span>
                 </div>
             </el-option>
+
+        <span slot="infoBlock" class="badge badge-success badge-resize float-right" v-if="new_options[real_model]">{{ new_text }}</span>
     </el-select>
 </template>
 
@@ -374,6 +409,7 @@ import { Select, Option, OptionGroup, ColorPicker } from 'element-ui';
 
 import AkauntingModalAddNew from './AkauntingModalAddNew';
 import AkauntingModal from './AkauntingModal';
+import AkauntingMoney from './AkauntingMoney';
 import AkauntingRadioGroup from './forms/AkauntingRadioGroup';
 import AkauntingSelect from './AkauntingSelect';
 import AkauntingDate from './AkauntingDate';
@@ -393,6 +429,7 @@ export default {
         AkauntingRadioGroup,
         AkauntingSelect,
         AkauntingModal,
+        AkauntingMoney,
         AkauntingDate,
         AkauntingRecurring,
     },
@@ -430,7 +467,11 @@ export default {
         },
         options: null,
 
-        model: null,
+        model: {
+            type: [String, Number],
+            default: '',
+            description: "Selectbox selected model"
+        },
 
         icon: {
             type: String,
@@ -446,6 +487,7 @@ export default {
                     path: null,
                     type: 'modal', // modal, inline
                     field: 'name',
+                    new_text: 'New',
                     buttons: {}
                 };
             },
@@ -462,6 +504,11 @@ export default {
             default: false,
             description: "Multible feature status"
         },
+        readonly: {
+            type: Boolean,
+            default: false,
+            description: "Selectbox disabled status"
+        },
         disabled: {
             type: Boolean,
             default: false,
@@ -509,16 +556,29 @@ export default {
     data() {
         return {
             list: [],
-            add_new: this.addNew,
+            add_new: {
+                text: this.addNew.text,
+                show: false,
+                path: this.addNew.path,
+                type: this.addNew.type, // modal, inline
+                field: this.addNew.name,
+                buttons: this.addNew.buttons
+            },
             add_new_text: this.addNew.text,
+            new_text: this.addNew.new_text,
             selectOptions: this.options,
             real_model: this.model,
             add_new_html: '',
             form: {},
             loading: false,
+            new_options: false,
         }
     },
 
+    created() {
+        this.new_options = {};
+    },
+
     mounted() {
         this.real_model = this.value;
 
@@ -601,7 +661,7 @@ export default {
         },
 
         addInline(value) {
-            axios.post(this.add_new.path, {
+            window.axios.post(this.add_new.path, {
                 '_token': window.Laravel.csrfToken,
                 'type': 'inline',
                 field: this.add_new.field,
@@ -612,6 +672,7 @@ export default {
                     this.selectOptions = [];
 
                     this.selectOptions.push(response.data.data);
+                    this.new_options[response.data.data.id] = response.data.data.id;
                     this.real_model = response.data.data.id;
 
                     this.change();
@@ -631,9 +692,9 @@ export default {
         onModal(value) {
             let add_new = this.add_new;
 
-            axios.get(this.add_new.path)
+            window.axios.get(this.add_new.path)
             .then(response => {
-                add_new.status = true;
+                add_new.show = true;
                 add_new.html = response.data.html;
 
                 if (this.title) {
@@ -644,13 +705,14 @@ export default {
 
                 this.add_new_html = Vue.component('add-new-component', function (resolve, reject) {
                     resolve({
-                        template: '<div><akaunting-modal-add-new :show="add_new.status" @submit="onSubmit" @cancel="add_new.status = false" :buttons="add_new.buttons" :title="add_new.text" :is_component=true :message="add_new.html"></akaunting-modal-add-new></div>',
+                        template: '<div><akaunting-modal-add-new :show="add_new.show" @submit="onSubmit" @cancel="onCancel" :buttons="add_new.buttons" :title="add_new.text" :is_component=true :message="add_new.html"></akaunting-modal-add-new></div>',
 
                         components: {
                             AkauntingModalAddNew,
                             AkauntingRadioGroup,
                             AkauntingSelect,
                             AkauntingModal,
+                            AkauntingMoney,
                             AkauntingDate,
                             AkauntingRecurring,
                             [ColorPicker.name]: ColorPicker,
@@ -665,6 +727,10 @@ export default {
                         methods: {
                             onSubmit(event) {
                                 this.$emit('submit', event);
+                            },
+
+                            onCancel(event) {
+                                this.$emit('cancel', event);
                             }
                         }
                     })
@@ -681,9 +747,11 @@ export default {
         onSubmit(event) {
             this.form = event;
 
+            this.loading = true;
+
             let data = this.form.data();
 
-            FormData.prototype.appendRecursive = function(data, wrapper = null) {  
+            FormData.prototype.appendRecursive = function(data, wrapper = null) {
                 for(var name in data) {
                     if (wrapper) {
                         if ((typeof data[name] == 'object' || data[name].constructor === Array) && ((data[name] instanceof File != true ) && (data[name] instanceof Blob != true))) {
@@ -719,11 +787,15 @@ export default {
 
                 if (response.data.success) {
                     this.selectOptions[response.data.data.id] = response.data.data['name'];
+                    this.new_options[response.data.data.id] = response.data.data['name'];
                     this.real_model = response.data.data.id.toString();
 
                     this.change();
 
-                    //this.add_new.status = false;
+                    //this.add_new.show = false;
+
+                    this.add_new.html = '';
+                    this.add_new_html = null;
                 }
             })
             .catch(error => {
@@ -734,6 +806,16 @@ export default {
                 this.method_show_html = error.message;
             });
         },
+
+        onCancel() {
+            this.add_new.show = false;
+            this.add_new.html = null;
+            this.add_new_html = null;
+        },
+
+        addModal() {
+
+        },
     },
 
     watch: {
@@ -803,4 +885,11 @@ export default {
     .el-select__footer div span {
         margin-left: 5px;
     }
+
+    .badge-resize {
+        float: right;
+        margin-top: -32px;
+        margin-right: 35px;
+        position: relative;
+    }
 </style>

From b243b3f750622a495bb2636583c537c9797db0a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Sat, 7 Mar 2020 17:18:29 +0300
Subject: [PATCH 20/65] Invoice item add new item changes..

---
 .../assets/js/components/AkauntingSelect.vue  |  2 +-
 .../js/components/AkauntingSelectRemote.vue   | 26 ++++++++++++++-----
 resources/views/sales/invoices/item.blade.php |  1 +
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/resources/assets/js/components/AkauntingSelect.vue b/resources/assets/js/components/AkauntingSelect.vue
index 92d4d09c7..0f713f714 100644
--- a/resources/assets/js/components/AkauntingSelect.vue
+++ b/resources/assets/js/components/AkauntingSelect.vue
@@ -381,7 +381,7 @@
         <span slot="infoBlock" class="badge badge-success badge-resize float-right" v-if="new_options[real_model]">{{ new_text }}</span>
 
         <select :name="name" v-model="real_model" class="d-none">
-            <option v-for="(label, value) in selectOptions" :value="value">{{ label }}</option>
+            <option v-for="(label, value) in selectOptions" :key="value" :value="value">{{ label }}</option>
         </select>
     </base-input>
 </template>
diff --git a/resources/assets/js/components/AkauntingSelectRemote.vue b/resources/assets/js/components/AkauntingSelectRemote.vue
index 7d66a1765..61b21d504 100644
--- a/resources/assets/js/components/AkauntingSelectRemote.vue
+++ b/resources/assets/js/components/AkauntingSelectRemote.vue
@@ -305,8 +305,8 @@
 
         <component v-bind:is="add_new_html" @submit="onSubmit"></component>
 
-        <select :name="name" class="d-none" v-model="real_model">
-            <option v-for="(label, value) in selectOptions" :value="value">{{ label }}</option>
+        <select :name="name" v-model="real_model" class="d-none">
+            <option v-for="(label, value) in selectOptions" :key="value" :value="value">{{ label }}</option>
         </select>
 
         <span slot="infoBlock" class="badge badge-success badge-resize float-right" v-if="new_options[real_model]">{{ new_text }}</span>
@@ -370,8 +370,8 @@
                :key="option.id"
                :label="option.name"
                :value="option.id">
-                <span class="float-left">{{ label }}</span>
-                <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span
+                <span class="float-left">{{ option.name }}</span>
+                <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[option.id]">{{ new_text }}</span>
             </el-option>
 
             <el-option-group
@@ -669,12 +669,16 @@ export default {
             })
             .then(response => {
                 if (response.data.success) {
+                    this.selectOptions[response.data.data.id] = response.data.data['name'];
+                    this.new_options[response.data.data.id] = response.data.data['name'];
+                    this.real_model = response.data.data.id;
+                    /*
                     this.selectOptions = [];
 
                     this.selectOptions.push(response.data.data);
                     this.new_options[response.data.data.id] = response.data.data.id;
                     this.real_model = response.data.data.id;
-
+                    */
                     this.change();
 
                     if (this.title) {
@@ -788,7 +792,7 @@ export default {
                 if (response.data.success) {
                     this.selectOptions[response.data.data.id] = response.data.data['name'];
                     this.new_options[response.data.data.id] = response.data.data['name'];
-                    this.real_model = response.data.data.id.toString();
+                    this.real_model = response.data.data.id;
 
                     this.change();
 
@@ -821,7 +825,15 @@ export default {
     watch: {
         options: function (options) {
             // update options
-            //this.selectOptions = options;
+            this.selectOptions = options;
+
+            if (Object.keys(this.new_options).length) {
+                for (let [key, value] of Object.entries(this.new_options)) {
+                    if (!this.selectOptions[key]) {
+                        this.selectOptions[key] = value;
+                    }
+                }
+            }
         },
 
         value: function (value) {
diff --git a/resources/views/sales/invoices/item.blade.php b/resources/views/sales/invoices/item.blade.php
index 8a25cb83b..a282d879d 100644
--- a/resources/views/sales/invoices/item.blade.php
+++ b/resources/views/sales/invoices/item.blade.php
@@ -30,6 +30,7 @@
                     'path' => route('modals.items.store'),
                     'type' => 'inline',
                     'field' => 'name',
+                    'new_text' => trans('modules.new'),
                 ])}}"
                 @interface="row.item_id = $event"
                 @label="row.name = $event"

From 58a796c2b480309825bd5925ed485b7abf9bf9ca Mon Sep 17 00:00:00 2001
From: denisdulici <denisdulici@gmail.com>
Date: Mon, 9 Mar 2020 10:26:02 +0300
Subject: [PATCH 21/65] moved ajax dispatch to trait

---
 app/Abstracts/Http/Controller.php | 31 +------------------------------
 app/Traits/Jobs.php               | 29 +++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/app/Abstracts/Http/Controller.php b/app/Abstracts/Http/Controller.php
index 779868b1b..2a4bf8bef 100644
--- a/app/Abstracts/Http/Controller.php
+++ b/app/Abstracts/Http/Controller.php
@@ -30,7 +30,7 @@ abstract class Controller extends BaseController
      *
      * @return void
      */
-    protected function setPermissions()
+    public function setPermissions()
     {
         // No need to check for permission in console
         if (app()->runningInConsole()) {
@@ -90,33 +90,4 @@ abstract class Controller extends BaseController
 
         return new LengthAwarePaginator($items->forPage($page, $perPage), $items->count(), $perPage, $page, $options);
     }
-
-    /**
-     * Dispatch a job to its appropriate handler and return a response array for ajax calls.
-     *
-     * @param mixed $job
-     * @return mixed
-     */
-    public function ajaxDispatch($job)
-    {
-        try {
-            $data = $this->dispatch($job);
-
-            $response = [
-                'success' => true,
-                'error' => false,
-                'data' => $data,
-                'message' => '',
-            ];
-        } catch(\Exception $e) {
-            $response = [
-                'success' => false,
-                'error' => true,
-                'data' => null,
-                'message' => $e->getMessage(),
-            ];
-        }
-
-        return $response;
-    }
 }
diff --git a/app/Traits/Jobs.php b/app/Traits/Jobs.php
index a3482face..c8fcb1a20 100644
--- a/app/Traits/Jobs.php
+++ b/app/Traits/Jobs.php
@@ -31,6 +31,35 @@ trait Jobs
         return $result;
     }
 
+    /**
+     * Dispatch a job to its appropriate handler and return a response array for ajax calls.
+     *
+     * @param mixed $job
+     * @return mixed
+     */
+    public function ajaxDispatch($job)
+    {
+        try {
+            $data = $this->dispatch($job);
+
+            $response = [
+                'success' => true,
+                'error' => false,
+                'data' => $data,
+                'message' => '',
+            ];
+        } catch(\Exception $e) {
+            $response = [
+                'success' => false,
+                'error' => true,
+                'data' => null,
+                'message' => $e->getMessage(),
+            ];
+        }
+
+        return $response;
+    }
+
     public function getDispatchFunction()
     {
         $config = config('queue.default');

From 3444cd8dd82eedadce2d42269405c5239a530bb1 Mon Sep 17 00:00:00 2001
From: blackpidgeon <black@pidegeon.org>
Date: Mon, 9 Mar 2020 09:02:25 +0100
Subject: [PATCH 22/65] Fix typo in function name

---
 app/Http/Controllers/Banking/Reconciliations.php | 2 +-
 app/Models/Banking/Account.php                   | 4 ++--
 app/Models/Setting/Category.php                  | 2 +-
 app/Widgets/IncomeByCategory.php                 | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/Banking/Reconciliations.php b/app/Http/Controllers/Banking/Reconciliations.php
index 96e0b9b29..1309127f0 100644
--- a/app/Http/Controllers/Banking/Reconciliations.php
+++ b/app/Http/Controllers/Banking/Reconciliations.php
@@ -198,7 +198,7 @@ class Reconciliations extends Controller
         $total = $account->opening_balance;
 
         // Sum income transactions
-        $transactions = $account->income_transacions()->whereDate('paid_at', '<', $started_at)->get();
+        $transactions = $account->income_transactions()->whereDate('paid_at', '<', $started_at)->get();
         foreach ($transactions as $item) {
             $total += $item->amount;
         }
diff --git a/app/Models/Banking/Account.php b/app/Models/Banking/Account.php
index 72a9211be..fa92b774c 100644
--- a/app/Models/Banking/Account.php
+++ b/app/Models/Banking/Account.php
@@ -39,7 +39,7 @@ class Account extends Model
         return $this->transactions()->where('type', 'expense');
     }
 
-    public function income_transacions()
+    public function income_transactions()
     {
         return $this->transactions()->where('type', 'income');
     }
@@ -81,7 +81,7 @@ class Account extends Model
         $total = $this->opening_balance;
 
         // Sum Incomes
-        $total += $this->income_transacions->sum('amount');
+        $total += $this->income_transactions->sum('amount');
 
         // Subtract Expenses
         $total -= $this->expense_transactions->sum('amount');
diff --git a/app/Models/Setting/Category.php b/app/Models/Setting/Category.php
index 9d93ca0d9..b627a811a 100644
--- a/app/Models/Setting/Category.php
+++ b/app/Models/Setting/Category.php
@@ -32,7 +32,7 @@ class Category extends Model
         return $this->transactions()->where('type', 'expense');
     }
 
-    public function income_transacions()
+    public function income_transactions()
     {
         return $this->transactions()->where('type', 'income');
     }
diff --git a/app/Widgets/IncomeByCategory.php b/app/Widgets/IncomeByCategory.php
index 46fd72a52..ee532420a 100644
--- a/app/Widgets/IncomeByCategory.php
+++ b/app/Widgets/IncomeByCategory.php
@@ -15,10 +15,10 @@ class IncomeByCategory extends Widget
 
     public function show()
     {
-        Category::with('income_transacions')->type('income')->each(function ($category) {
+        Category::with('income_transactions')->type('income')->each(function ($category) {
             $amount = 0;
 
-            $this->applyFilters($category->income_transacions())->each(function ($transaction) use (&$amount) {
+            $this->applyFilters($category->income_transactions())->each(function ($transaction) use (&$amount) {
                 $amount += $transaction->getAmountConvertedToDefault();
             });
 

From 3dde3af30042d9e5aeb02a25c13681bf70c2ab9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Mon, 9 Mar 2020 11:54:18 +0300
Subject: [PATCH 23/65] Modal create account.

---
 app/Http/Controllers/Modals/Accounts.php      | 65 +++++++++++++++++++
 .../views/modals/accounts/create.blade.php    | 21 ++++++
 routes/admin.php                              |  1 +
 3 files changed, 87 insertions(+)
 create mode 100644 app/Http/Controllers/Modals/Accounts.php
 create mode 100644 resources/views/modals/accounts/create.blade.php

diff --git a/app/Http/Controllers/Modals/Accounts.php b/app/Http/Controllers/Modals/Accounts.php
new file mode 100644
index 000000000..477c00c21
--- /dev/null
+++ b/app/Http/Controllers/Modals/Accounts.php
@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Http\Controllers\Modals;
+
+use App\Abstracts\Http\Controller;
+use App\Http\Requests\Banking\Account as Request;
+use App\Jobs\Banking\CreateAccount;
+use App\Models\Banking\Account;
+use App\Models\Setting\Currency;
+
+class Accounts extends Controller
+{
+    /**
+     * Instantiate a new controller instance.
+     */
+    public function __construct()
+    {
+        // Add CRUD permission check
+        $this->middleware('permission:create-banking-accounts')->only(['create', 'store', 'duplicate', 'import']);
+        $this->middleware('permission:read-banking-accounts')->only(['index', 'show', 'edit', 'export']);
+        $this->middleware('permission:update-banking-accounts')->only(['update', 'enable', 'disable']);
+        $this->middleware('permission:delete-banking-accounts')->only('destroy');
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return Response
+     */
+    public function create()
+    {
+        $currencies = Currency::enabled()->pluck('name', 'code');
+
+        $currency = Currency::where('code', '=', setting('default.currency'))->first();
+
+        $html = view('modals.accounts.create', compact('currencies', 'currency'))->render();
+
+        return response()->json([
+            'success' => true,
+            'error' => false,
+            'message' => 'null',
+            'html' => $html,
+        ]);
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  Request  $request
+     *
+     * @return Response
+     */
+    public function store(Request $request)
+    {
+        $request['enabled'] = 1;
+
+        $response = $this->ajaxDispatch(new CreateAccount($request));
+
+        if ($response['success']) {
+            $response['message'] = trans('messages.success.added', ['type' => trans_choice('general.accounts', 1)]);
+        }
+
+        return response()->json($response);
+    }
+}
diff --git a/resources/views/modals/accounts/create.blade.php b/resources/views/modals/accounts/create.blade.php
new file mode 100644
index 000000000..e62522ec1
--- /dev/null
+++ b/resources/views/modals/accounts/create.blade.php
@@ -0,0 +1,21 @@
+{!! Form::open([
+    'id' => 'form-create-account',
+    '@submit.prevent' => 'onSubmit',
+    '@keydown' => 'form.errors.clear($event.target.name)',
+    'role' => 'form',
+    'class' => 'form-loading-button',
+    'route' => 'accounts.store',
+    'novalidate' => true
+]) !!}
+    <div class="row">
+        {{ Form::textGroup('name', trans('general.name'), 'font') }}
+
+        {{ Form::textGroup('number', trans('accounts.number'), 'pencil-alt') }}
+
+        {{ Form::selectGroup('currency_code', trans_choice('general.currencies', 1), 'exchange-alt', $currencies, setting('default.currency'), ['required' => 'required', 'change' => 'onChangeCurrency']) }}
+
+        {{ Form::moneyGroup('opening_balance', trans('accounts.opening_balance'), 'balance-scale', ['required' => 'required', 'currency' => $currency], 0.00) }}
+
+        {!! Form::hidden('enabled', '1', []) !!}
+    </div>
+{!! Form::close() !!}
diff --git a/routes/admin.php b/routes/admin.php
index 5c7b4fd83..2bee70a97 100644
--- a/routes/admin.php
+++ b/routes/admin.php
@@ -213,6 +213,7 @@ Route::group(['prefix' => 'install'], function () {
 });
 
 Route::group(['as' => 'modals.', 'prefix' => 'modals'], function () {
+    Route::resource('accounts', 'Modals\Accounts');
     Route::resource('categories', 'Modals\Categories');
     Route::resource('currencies', 'Modals\Currencies');
     Route::resource('customers', 'Modals\Customers');

From 27b12da3547db72de727fa24a19534aa0f74b1c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Mon, 9 Mar 2020 11:57:06 +0300
Subject: [PATCH 24/65] select new feature fixed.

---
 resources/assets/js/components/AkauntingSelect.vue     | 10 +++++-----
 resources/views/banking/accounts/create.blade.php      |  2 +-
 resources/views/banking/accounts/edit.blade.php        |  2 +-
 .../views/banking/reconciliations/create.blade.php     |  2 +-
 resources/views/common/items/create.blade.php          |  2 +-
 resources/views/common/items/edit.blade.php            |  2 +-
 resources/views/modals/items/create.blade.php          |  4 ++--
 .../partials/form/multi_select_add_new_group.blade.php |  5 ++++-
 .../views/partials/form/select_add_new_group.blade.php |  5 ++++-
 .../partials/form/select_group_add_new_group.blade.php |  5 ++++-
 resources/views/purchases/bills/create.blade.php       |  2 +-
 resources/views/purchases/bills/edit.blade.php         |  2 +-
 resources/views/purchases/payments/create.blade.php    |  2 +-
 resources/views/purchases/payments/edit.blade.php      |  2 +-
 resources/views/purchases/vendors/create.blade.php     |  2 +-
 resources/views/purchases/vendors/edit.blade.php       |  2 +-
 resources/views/sales/customers/create.blade.php       |  2 +-
 resources/views/sales/customers/edit.blade.php         |  2 +-
 resources/views/sales/invoices/create.blade.php        |  2 +-
 resources/views/sales/invoices/edit.blade.php          |  2 +-
 resources/views/sales/revenues/create.blade.php        |  2 +-
 resources/views/sales/revenues/edit.blade.php          |  2 +-
 22 files changed, 36 insertions(+), 27 deletions(-)

diff --git a/resources/assets/js/components/AkauntingSelect.vue b/resources/assets/js/components/AkauntingSelect.vue
index 0f713f714..3ba0d9109 100644
--- a/resources/assets/js/components/AkauntingSelect.vue
+++ b/resources/assets/js/components/AkauntingSelect.vue
@@ -470,7 +470,7 @@ export default {
                     status: false,
                     path: null,
                     type: 'modal', // modal, inline
-                    field: 'name',
+                    field: {},
                     new_text: 'New',
                     buttons: {}
                 };
@@ -523,7 +523,7 @@ export default {
                 show: false,
                 path: this.addNew.path,
                 type: this.addNew.type, // modal, inline
-                field: this.addNew.name,
+                field: this.addNew.field,
                 buttons: this.addNew.buttons
             },
             add_new_text: this.addNew.text,
@@ -660,9 +660,9 @@ export default {
                 this.form.loading = false;
 
                 if (response.data.success) {
-                    this.selectOptions[response.data.data.id] = response.data.data['name'];
-                    this.new_options[response.data.data.id] = response.data.data['name'];
-                    this.real_model = response.data.data.id.toString();
+                    this.selectOptions[response.data.data[this.add_new.field.key]] = response.data.data[this.add_new.field.value];
+                    this.new_options[response.data.data[this.add_new.field.key]] = response.data.data[this.add_new.field.value];
+                    this.real_model = response.data.data[this.add_new.field.key].toString();
 
                     this.change();
 
diff --git a/resources/views/banking/accounts/create.blade.php b/resources/views/banking/accounts/create.blade.php
index f50d52f2d..c1db44e49 100644
--- a/resources/views/banking/accounts/create.blade.php
+++ b/resources/views/banking/accounts/create.blade.php
@@ -21,7 +21,7 @@
 
                     {{ Form::textGroup('number', trans('accounts.number'), 'pencil-alt') }}
 
-                    {{ Form::selectAddNewGroup('currency_code', trans_choice('general.currencies', 1), 'exchange-alt', $currencies, setting('default.currency'), ['required' => 'required', 'path' => route('modals.currencies.create'), 'change' => 'onChangeCurrency']) }}
+                    {{ Form::selectAddNewGroup('currency_code', trans_choice('general.currencies', 1), 'exchange-alt', $currencies, setting('default.currency'), ['required' => 'required', 'path' => route('modals.currencies.create'), 'field' => ['key' => 'code', 'value' => 'name'], 'change' => 'onChangeCurrency']) }}
 
                     {{ Form::moneyGroup('opening_balance', trans('accounts.opening_balance'), 'balance-scale', ['required' => 'required', 'currency' => $currency], 0) }}
 
diff --git a/resources/views/banking/accounts/edit.blade.php b/resources/views/banking/accounts/edit.blade.php
index e01f468b9..4a0014f67 100644
--- a/resources/views/banking/accounts/edit.blade.php
+++ b/resources/views/banking/accounts/edit.blade.php
@@ -22,7 +22,7 @@
 
                     {{ Form::textGroup('number', trans('accounts.number'), 'pencil-alt') }}
 
-                    {{ Form::selectAddNewGroup('currency_code', trans_choice('general.currencies', 1), 'exchange-alt', $currencies, $account->currency_code, ['required' => 'required', 'path' => route('modals.currencies.create'), 'change' => 'onChangeCurrency']) }}
+                    {{ Form::selectAddNewGroup('currency_code', trans_choice('general.currencies', 1), 'exchange-alt', $currencies, $account->currency_code, ['required' => 'required', 'path' => route('modals.currencies.create'), 'field' => ['key' => 'code', 'value' => 'name'], 'change' => 'onChangeCurrency']) }}
 
                     {{ Form::moneyGroup('opening_balance', trans('accounts.opening_balance'), 'balance-scale', ['required' => 'required', 'currency' => $currency], $account->opening_balance) }}
 
diff --git a/resources/views/banking/reconciliations/create.blade.php b/resources/views/banking/reconciliations/create.blade.php
index 16dcb7c4e..2dbb5c4f7 100644
--- a/resources/views/banking/reconciliations/create.blade.php
+++ b/resources/views/banking/reconciliations/create.blade.php
@@ -22,7 +22,7 @@
 
                     {{ Form::moneyGroup('closing_balance', trans('reconciliations.closing_balance'), 'balance-scale', ['required' => 'required', 'autofocus' => 'autofocus', 'currency' => $currency], request('closing_balance', 0.00), 'col-xl-2') }}
 
-                    {{ Form::selectGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts, request('account_id', setting('default.account')), ['required' => 'required', 'change' => 'onChangeAccount'], 'col-xl-2') }}
+                    {{ Form::selectAddNewGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts, request('account_id', setting('default.account')), ['required' => 'required', 'path' => route('modals.accounts.create'), 'change' => 'onChangeAccount'], 'col-xl-2') }}
 
                     <div class="col-xl-2">
                         {!! Form::button('<span class="fa fa-list"></span> &nbsp;' . trans('reconciliations.transactions'), ['type' => 'button', '@click' => 'onReconcilition', 'class' => 'btn btn-success header-button-top']) !!}
diff --git a/resources/views/common/items/create.blade.php b/resources/views/common/items/create.blade.php
index 875e476d9..62023f1a7 100644
--- a/resources/views/common/items/create.blade.php
+++ b/resources/views/common/items/create.blade.php
@@ -19,7 +19,7 @@
                 <div class="row">
                     {{ Form::textGroup('name', trans('general.name'), 'tag') }}
 
-                    {{ Form::selectAddNewGroup('tax_id', trans_choice('general.taxes', 1), 'percentage', $taxes, setting('default.tax'), ['path' => route('modals.taxes.create')]) }}
+                    {{ Form::selectAddNewGroup('tax_id', trans_choice('general.taxes', 1), 'percentage', $taxes, setting('default.tax'), ['path' => route('modals.taxes.create'), 'field' => ['key' => 'id', 'value' => 'title']]) }}
 
                     {{ Form::textareaGroup('description', trans('general.description')) }}
 
diff --git a/resources/views/common/items/edit.blade.php b/resources/views/common/items/edit.blade.php
index fca27b25b..f0e93058c 100644
--- a/resources/views/common/items/edit.blade.php
+++ b/resources/views/common/items/edit.blade.php
@@ -20,7 +20,7 @@
                 <div class="row">
                     {{ Form::textGroup('name', trans('general.name'), 'tag') }}
 
-                    {{ Form::selectAddNewGroup('tax_id', trans_choice('general.taxes', 1), 'percentage', $taxes, $item->tax_id, ['path' => route('modals.taxes.create')]) }}
+                    {{ Form::selectAddNewGroup('tax_id', trans_choice('general.taxes', 1), 'percentage', $taxes, $item->tax_id, ['path' => route('modals.taxes.create'), 'field' => ['key' => 'id', 'value' => 'title']]) }}
 
                     {{ Form::textareaGroup('description', trans('general.description')) }}
 
diff --git a/resources/views/modals/items/create.blade.php b/resources/views/modals/items/create.blade.php
index deb855afd..64f64fa16 100644
--- a/resources/views/modals/items/create.blade.php
+++ b/resources/views/modals/items/create.blade.php
@@ -10,7 +10,7 @@
     <div class="row">
         {{ Form::textGroup('name', trans('general.name'), 'tag') }}
 
-        {{ Form::selectAddNewGroup('tax_id', trans_choice('general.taxes', 1), 'percentage', $taxes, setting('default.tax'), ['path' => route('modals.taxes.create')]) }}
+        {{ Form::selectGroup('tax_id', trans_choice('general.taxes', 1), 'percentage', $taxes, setting('default.tax'), []) }}
 
         {{ Form::textareaGroup('description', trans('general.description')) }}
 
@@ -18,7 +18,7 @@
 
         {{ Form::textGroup('purchase_price', trans('items.purchase_price'), 'money-bill-wave-alt') }}
 
-        {{ Form::selectAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, null, ['required' => 'required', 'path' => route('modals.categories.create') . '?type=item']) }}
+        {{ Form::selectGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, null) }}
 
         {!! Form::hidden('enabled', '1', []) !!}
     </div>
diff --git a/resources/views/partials/form/multi_select_add_new_group.blade.php b/resources/views/partials/form/multi_select_add_new_group.blade.php
index 736668ac1..b7208974d 100644
--- a/resources/views/partials/form/multi_select_add_new_group.blade.php
+++ b/resources/views/partials/form/multi_select_add_new_group.blade.php
@@ -30,7 +30,10 @@
             'text' => trans('general.add_new'),
             'path' => isset($attributes['path']) ? $attributes['path']: false,
             'type' => isset($attributes['type']) ? $attributes['type'] : 'modal',
-            'field' => isset($attributes['field']) ? $attributes['field'] : 'name',
+            'field' => [
+                'key' => isset($attributes['field']['key']) ? $attributes['field']['key'] : 'id',
+                'value' => isset($attributes['field']['value']) ? $attributes['field']['value'] : 'name'
+            ],
             'new_text' => trans('modules.new'),
             'buttons' => [
                 'cancel' => [
diff --git a/resources/views/partials/form/select_add_new_group.blade.php b/resources/views/partials/form/select_add_new_group.blade.php
index adea5052f..14383fc84 100644
--- a/resources/views/partials/form/select_add_new_group.blade.php
+++ b/resources/views/partials/form/select_add_new_group.blade.php
@@ -28,7 +28,10 @@
             'text' => trans('general.add_new'),
             'path' => isset($attributes['path']) ? $attributes['path']: false,
             'type' => isset($attributes['type']) ? $attributes['type'] : 'modal',
-            'field' => isset($attributes['field']) ? $attributes['field'] : 'name',
+            'field' => [
+                'key' => isset($attributes['field']['key']) ? $attributes['field']['key'] : 'id',
+                'value' => isset($attributes['field']['value']) ? $attributes['field']['value'] : 'name'
+            ],
             'new_text' => trans('modules.new'),
             'buttons' => [
                 'cancel' => [
diff --git a/resources/views/partials/form/select_group_add_new_group.blade.php b/resources/views/partials/form/select_group_add_new_group.blade.php
index b98c773b8..117d00f6d 100644
--- a/resources/views/partials/form/select_group_add_new_group.blade.php
+++ b/resources/views/partials/form/select_group_add_new_group.blade.php
@@ -28,7 +28,10 @@
             'text' => trans('general.add_new'),
             'path' => isset($attributes['path']) ? $attributes['path']: false,
             'type' => isset($attributes['type']) ? $attributes['type'] : 'modal',
-            'field' => isset($attributes['field']) ? $attributes['field'] : 'name',
+            'field' => [
+                'key' => isset($attributes['field']['key']) ? $attributes['field']['key'] : 'id',
+                'value' => isset($attributes['field']['value']) ? $attributes['field']['value'] : 'name'
+            ],
             'new_text' => trans('modules.new'),
             'buttons' => [
                 'cancel' => [
diff --git a/resources/views/purchases/bills/create.blade.php b/resources/views/purchases/bills/create.blade.php
index 9c62679a8..910fb1268 100644
--- a/resources/views/purchases/bills/create.blade.php
+++ b/resources/views/purchases/bills/create.blade.php
@@ -19,7 +19,7 @@
                 <div class="row">
                     {{ Form::selectAddNewGroup('contact_id', trans_choice('general.vendors', 1), 'user', $vendors, config('general.vendors'), ['required' => 'required', 'path' => route('modals.vendors.create'), 'change' => 'onChangeContact']) }}
 
-                    {{ Form::selectAddNewGroup('currency_code', trans_choice('general.currencies', 1), 'exchange-alt', $currencies, setting('default.currency'), ['required' => 'required', 'path' => route('modals.currencies.create'), 'change' => 'onChangeCurrency']) }}
+                    {{ Form::selectAddNewGroup('currency_code', trans_choice('general.currencies', 1), 'exchange-alt', $currencies, setting('default.currency'), ['required' => 'required', 'path' => route('modals.currencies.create'), 'field' => ['key' => 'code', 'value' => 'name'], 'change' => 'onChangeCurrency']) }}
 
                     {{ Form::dateGroup('billed_at', trans('bills.bill_date'), 'calendar', ['id' => 'billed_at', 'class' => 'form-control datepicker', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], request()->get('billed_at', Date::now()->toDateString())) }}
 
diff --git a/resources/views/purchases/bills/edit.blade.php b/resources/views/purchases/bills/edit.blade.php
index 56e844f9c..415960492 100644
--- a/resources/views/purchases/bills/edit.blade.php
+++ b/resources/views/purchases/bills/edit.blade.php
@@ -20,7 +20,7 @@
                 <div class="row">
                     {{ Form::selectAddNewGroup('contact_id', trans_choice('general.vendors', 1), 'user', $vendors, $bill->contact_id, ['required' => 'required', 'path' => route('modals.vendors.create'), 'change' => 'onChangeContact']) }}
 
-                    {{ Form::selectAddNewGroup('currency_code', trans_choice('general.currencies', 1), 'exchange-alt', $currencies, $bill->currency_code, ['required' => 'required', 'path' => route('modals.currencies.create'), 'change' => 'onChangeCurrency']) }}
+                    {{ Form::selectAddNewGroup('currency_code', trans_choice('general.currencies', 1), 'exchange-alt', $currencies, $bill->currency_code, ['required' => 'required', 'path' => route('modals.currencies.create'), 'field' => ['key' => 'code', 'value' => 'name'], 'change' => 'onChangeCurrency']) }}
 
                     {{ Form::dateGroup('billed_at', trans('bills.bill_date'), 'calendar', ['id' => 'billed_at', 'class' => 'form-control datepicker', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], Date::parse($bill->billed_at)->toDateString()) }}
 
diff --git a/resources/views/purchases/payments/create.blade.php b/resources/views/purchases/payments/create.blade.php
index 8649154d8..a496ca250 100644
--- a/resources/views/purchases/payments/create.blade.php
+++ b/resources/views/purchases/payments/create.blade.php
@@ -24,7 +24,7 @@
 
                     {{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'currency' => $currency], 0.00) }}
 
-                    {{ Form::selectGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts, setting('default.account'), ['required' => 'required', 'change' => 'onChangeAccount']) }}
+                    {{ Form::selectAddNewGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts, setting('default.account'), ['required' => 'required', 'path' => route('modals.accounts.create'), 'change' => 'onChangeAccount']) }}
 
                     {{ Form::selectAddNewGroup('contact_id', trans_choice('general.vendors', 1), 'user', $vendors, setting('default.vendor'), ['path' => route('modals.vendors.create')]) }}
 
diff --git a/resources/views/purchases/payments/edit.blade.php b/resources/views/purchases/payments/edit.blade.php
index 46e50e34c..377760a62 100644
--- a/resources/views/purchases/payments/edit.blade.php
+++ b/resources/views/purchases/payments/edit.blade.php
@@ -43,7 +43,7 @@
 
                     {{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'autofocus' => 'autofocus', 'currency' => $currency], $payment->amount) }}
 
-                    {{ Form::selectGroup('account_id',  trans_choice('general.accounts', 1), 'university', $accounts, $payment->account_id, ['required' => 'required', 'change' => 'onChangeAccount']) }}
+                    {{ Form::selectAddNewGroup('account_id',  trans_choice('general.accounts', 1), 'university', $accounts, $payment->account_id, ['required' => 'required', 'path' => route('modals.accounts.create'), 'change' => 'onChangeAccount']) }}
 
                     {{ Form::selectAddNewGroup('contact_id', trans_choice('general.vendors', 1), 'user', $vendors, $payment->contact_id, ['path' => route('modals.vendors.create')]) }}
 
diff --git a/resources/views/purchases/vendors/create.blade.php b/resources/views/purchases/vendors/create.blade.php
index e78f6e1ae..b3480255d 100644
--- a/resources/views/purchases/vendors/create.blade.php
+++ b/resources/views/purchases/vendors/create.blade.php
@@ -23,7 +23,7 @@
 
                     {{ Form::textGroup('tax_number', trans('general.tax_number'), 'percent', []) }}
 
-                    {{ Form::selectAddNewGroup('currency_code', trans_choice('general.currencies', 1), 'exchange-alt', $currencies, setting('default.currency'), ['required' => 'required', 'path' => route('modals.currencies.create')]) }}
+                    {{ Form::selectAddNewGroup('currency_code', trans_choice('general.currencies', 1), 'exchange-alt', $currencies, setting('default.currency'), ['required' => 'required', 'path' => route('modals.currencies.create'), 'field' => ['key' => 'code', 'value' => 'name']]) }}
 
                     {{ Form::textGroup('phone', trans('general.phone'), 'phone', []) }}
 
diff --git a/resources/views/purchases/vendors/edit.blade.php b/resources/views/purchases/vendors/edit.blade.php
index 2ba74f074..41167795d 100644
--- a/resources/views/purchases/vendors/edit.blade.php
+++ b/resources/views/purchases/vendors/edit.blade.php
@@ -24,7 +24,7 @@
 
                     {{ Form::textGroup('tax_number', trans('general.tax_number'), 'percent', []) }}
 
-                    {{ Form::selectAddNewGroup('currency_code', trans_choice('general.currencies', 1), 'exchange-alt', $currencies, $vendor->currency_code, ['required' => 'required', 'path' => route('modals.currencies.create')]) }}
+                    {{ Form::selectAddNewGroup('currency_code', trans_choice('general.currencies', 1), 'exchange-alt', $currencies, $vendor->currency_code, ['required' => 'required', 'path' => route('modals.currencies.create'), 'field' => ['key' => 'code', 'value' => 'name']]) }}
 
                     {{ Form::textGroup('phone', trans('general.phone'), 'phone', []) }}
 
diff --git a/resources/views/sales/customers/create.blade.php b/resources/views/sales/customers/create.blade.php
index 4f0b40f44..80a18a2d4 100644
--- a/resources/views/sales/customers/create.blade.php
+++ b/resources/views/sales/customers/create.blade.php
@@ -24,7 +24,7 @@
 
                 {{ Form::textGroup('tax_number', trans('general.tax_number'), 'percent', []) }}
 
-                {{ Form::selectAddNewGroup('currency_code', trans_choice('general.currencies', 1), 'exchange-alt', $currencies, setting('default.currency'), ['required' => 'required', 'path' => route('modals.currencies.create')]) }}
+                {{ Form::selectAddNewGroup('currency_code', trans_choice('general.currencies', 1), 'exchange-alt', $currencies, setting('default.currency'), ['required' => 'required', 'path' => route('modals.currencies.create'), 'field' => ['key' => 'code', 'value' => 'name']]) }}
 
                 {{ Form::textGroup('phone', trans('general.phone'), 'phone', []) }}
 
diff --git a/resources/views/sales/customers/edit.blade.php b/resources/views/sales/customers/edit.blade.php
index 0ff5d74f9..58851e745 100644
--- a/resources/views/sales/customers/edit.blade.php
+++ b/resources/views/sales/customers/edit.blade.php
@@ -23,7 +23,7 @@
 
                 {{ Form::textGroup('tax_number', trans('general.tax_number'), 'percent', []) }}
 
-                {{ Form::selectAddNewGroup('currency_code', trans_choice('general.currencies', 1), 'exchange-alt', $currencies, $customer->currency_code, ['required' => 'required', 'path' => route('modals.currencies.create')]) }}
+                {{ Form::selectAddNewGroup('currency_code', trans_choice('general.currencies', 1), 'exchange-alt', $currencies, $customer->currency_code, ['required' => 'required', 'path' => route('modals.currencies.create'), 'field' => ['key' => 'code', 'value' => 'name']]) }}
 
                 {{ Form::textGroup('phone', trans('general.phone'), 'phone', []) }}
 
diff --git a/resources/views/sales/invoices/create.blade.php b/resources/views/sales/invoices/create.blade.php
index cf5fe2f53..0c0726986 100644
--- a/resources/views/sales/invoices/create.blade.php
+++ b/resources/views/sales/invoices/create.blade.php
@@ -19,7 +19,7 @@
                 <div class="row">
                     {{ Form::selectAddNewGroup('contact_id', trans_choice('general.customers', 1), 'user', $customers, config('general.customers'), ['required' => 'required', 'path' => route('modals.customers.create'), 'change' => 'onChangeContact']) }}
 
-                    {{ Form::selectAddNewGroup('currency_code', trans_choice('general.currencies', 1), 'exchange-alt', $currencies, setting('default.currency'), ['required' => 'required', 'path' => route('modals.currencies.create'), 'change' => 'onChangeCurrency']) }}
+                    {{ Form::selectAddNewGroup('currency_code', trans_choice('general.currencies', 1), 'exchange-alt', $currencies, setting('default.currency'), ['required' => 'required', 'path' => route('modals.currencies.create'), 'field' => ['key' => 'code', 'value' => 'name'], 'change' => 'onChangeCurrency']) }}
 
                     {{ Form::dateGroup('invoiced_at', trans('invoices.invoice_date'), 'calendar', ['id' => 'invoiced_at', 'class' => 'form-control datepicker', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], request()->get('invoiced_at', Date::now()->toDateString())) }}
 
diff --git a/resources/views/sales/invoices/edit.blade.php b/resources/views/sales/invoices/edit.blade.php
index 949706b7f..7e3a3c65e 100644
--- a/resources/views/sales/invoices/edit.blade.php
+++ b/resources/views/sales/invoices/edit.blade.php
@@ -20,7 +20,7 @@
                 <div class="row">
                     {{ Form::selectAddNewGroup('contact_id', trans_choice('general.customers', 1), 'user', $customers, $invoice->contact_id, ['required' => 'required', 'path' => route('modals.customers.create'), 'change' => 'onChangeContact']) }}
 
-                    {{ Form::selectAddNewGroup('currency_code', trans_choice('general.currencies', 1), 'exchange-alt', $currencies, $invoice->currency_code, ['required' => 'required', 'path' => route('modals.currencies.create'), 'change' => 'onChangeCurrency']) }}
+                    {{ Form::selectAddNewGroup('currency_code', trans_choice('general.currencies', 1), 'exchange-alt', $currencies, $invoice->currency_code, ['required' => 'required', 'path' => route('modals.currencies.create'), 'field' => ['key' => 'code', 'value' => 'name'], 'change' => 'onChangeCurrency']) }}
 
                     {{ Form::dateGroup('invoiced_at', trans('invoices.invoice_date'), 'calendar', ['id' => 'invoiced_at', 'class' => 'form-control datepicker', 'required' => 'required', 'date-format' => 'Y-m-d', 'autocomplete' => 'off'], Date::parse($invoice->invoiced_at)->toDateString()) }}
 
diff --git a/resources/views/sales/revenues/create.blade.php b/resources/views/sales/revenues/create.blade.php
index 8c0dfddac..bb7cab44f 100644
--- a/resources/views/sales/revenues/create.blade.php
+++ b/resources/views/sales/revenues/create.blade.php
@@ -24,7 +24,7 @@
 
                     {{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'autofocus' => 'autofocus', 'currency' => $currency], 0) }}
 
-                    {{ Form::selectGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts, setting('default.account'), ['required' => 'required', 'change' => 'onChangeAccount']) }}
+                    {{ Form::selectAddNewGroup('account_id', trans_choice('general.accounts', 1), 'university', $accounts, setting('default.account'), ['required' => 'required', 'path' => route('modals.accounts.create'), 'change' => 'onChangeAccount']) }}
 
                     {{ Form::selectAddNewGroup('contact_id', trans_choice('general.customers', 1), 'user', $customers, setting('default.contact'), ['path' => route('modals.customers.create')]) }}
 
diff --git a/resources/views/sales/revenues/edit.blade.php b/resources/views/sales/revenues/edit.blade.php
index 4fde29250..37e9cd77b 100644
--- a/resources/views/sales/revenues/edit.blade.php
+++ b/resources/views/sales/revenues/edit.blade.php
@@ -43,7 +43,7 @@
 
                     {{ Form::moneyGroup('amount', trans('general.amount'), 'money-bill-alt', ['required' => 'required', 'autofocus' => 'autofocus', 'currency' => $currency], $revenue->amount) }}
 
-                    {{ Form::selectGroup('account_id',  trans_choice('general.accounts', 1), 'university', $accounts, $revenue->account_id, ['required' => 'required', 'change' => 'onChangeAccount']) }}
+                    {{ Form::selectAddNewGroup('account_id',  trans_choice('general.accounts', 1), 'university', $accounts, $revenue->account_id, ['required' => 'required', 'path' => route('modals.accounts.create'), 'change' => 'onChangeAccount']) }}
 
                     {{ Form::selectAddNewGroup('contact_id', trans_choice('general.customers', 1), 'user', $customers, $revenue->contact_id, ['path' => route('modals.customers.create')]) }}
 

From de0d74bb5f0c156216b26b1134d097203efa3630 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Mon, 9 Mar 2020 12:43:56 +0300
Subject: [PATCH 25/65] close #1336 Fixed: Wrong amount sent to backend

---
 app/Http/Middleware/Money.php | 29 +++--------------------------
 1 file changed, 3 insertions(+), 26 deletions(-)

diff --git a/app/Http/Middleware/Money.php b/app/Http/Middleware/Money.php
index 538ded968..a84e0a3b2 100644
--- a/app/Http/Middleware/Money.php
+++ b/app/Http/Middleware/Money.php
@@ -22,15 +22,10 @@ class Money
             $sale_price = $request->get('sale_price');
             $purchase_price = $request->get('purchase_price');
             $opening_balance = $request->get('opening_balance');
-            $currency_code = $request->get('currency_code');
             $items = $request->get('items');
 
-            if (empty($currency_code)) {
-                $currency_code = setting('default.currency');
-            }
-
             if (!empty($amount)) {
-                $amount = money($request->get('amount'), $currency_code)->getAmount();
+                $amount = money($amount)->getAmount();
 
                 $request->request->set('amount', $amount);
             }
@@ -42,11 +37,7 @@ class Money
                             continue;
                         }
 
-                        if (isset($item['currency']) && $item['currency'] != $currency_code) {
-                            $items[$key]['price'] = money($item['price'], $item['currency'])->getAmount();
-                        } else {
-                            $items[$key]['price'] = money($item['price'], $currency_code)->getAmount();
-                        }
+                        $items[$key]['price'] = money($item['price'])->getAmount();
                     }
 
                     $request->request->set('items', $items);
@@ -54,24 +45,10 @@ class Money
             }
 
             if (isset($opening_balance)) {
-                $opening_balance = money($opening_balance, $currency_code)->getAmount();
+                $opening_balance = money($opening_balance)->getAmount();
 
                 $request->request->set('opening_balance', $opening_balance);
             }
-
-            /* check item price use money
-            if (isset($sale_price)) {
-                $sale_price = money($sale_price, $currency_code)->getAmount();
-
-                $request->request->set('sale_price', $sale_price);
-            }
-
-            if (isset($purchase_price)) {
-                $purchase_price = money($purchase_price, $currency_code)->getAmount();
-
-                $request->request->set('purchase_price', $purchase_price);
-            }
-            */
         }
 
         return $next($request);

From e14486154cc5b38f0c2e88057d7cb7725050cdc0 Mon Sep 17 00:00:00 2001
From: batuhanbas <b1atuhanb1as@gmail.com>
Date: Mon, 9 Mar 2020 17:17:42 +0300
Subject: [PATCH 26/65] reports data alignment updated

---
 app/Abstracts/Report.php                      | 45 +++++++++++++++++++
 public/css/akaunting-color.css                | 13 ++++--
 public/css/custom.css                         | 16 +++++--
 public/css/print.css                          |  5 +++
 .../partials/reports/table/footer.blade.php   |  8 ++--
 .../partials/reports/table/header.blade.php   | 10 ++---
 .../partials/reports/table/rows.blade.php     |  8 ++--
 .../profit_loss/content/footer.blade.php      |  8 ++--
 .../profit_loss/content/header.blade.php      |  8 ++--
 .../profit_loss/table/footer.blade.php        |  8 ++--
 10 files changed, 97 insertions(+), 32 deletions(-)

diff --git a/app/Abstracts/Report.php b/app/Abstracts/Report.php
index aa94530ff..a4a8d0064 100644
--- a/app/Abstracts/Report.php
+++ b/app/Abstracts/Report.php
@@ -67,6 +67,9 @@ abstract class Report
         'datasets' => [],
     ];
 
+    public $column_width = 'report-column';
+    public $head_column_width = 'head_report_column';
+
     public function __construct(Model $model = null, $load_data = true)
     {
         $this->setGroups();
@@ -76,6 +79,8 @@ abstract class Report
         }
 
         $this->model = $model;
+        $this->setHeadColumnWidth();
+        $this->setDataColumnWidth();
 
         if (!$load_data) {
             return;
@@ -198,6 +203,46 @@ abstract class Report
         return \Excel::download(new Export($this->views['content'], $this), \Str::filename($this->model->name) . '.xlsx');
     }
 
+    public function setHeadColumnWidth()
+    {
+        if (empty($this->model->settings->period)) {
+            return;
+        }
+
+        $head_width = 'head_report_column';
+
+        switch ($this->model->settings->period) {
+            case 'quarterly':
+                $head_width = 'col-sm-2';
+                break;
+            case 'yearly':
+                $head_width = 'col-sm-4';
+                break;
+        }
+
+        $this->head_column_width = $head_width;
+    }
+
+    public function setDataColumnWidth()
+    {
+        if (empty($this->model->settings->period)) {
+            return;
+        }
+
+        $width = 'report-column';
+
+        switch ($this->model->settings->period) {
+            case 'quarterly':
+                $width = 'col-sm-2';
+                break;
+            case 'yearly':
+                $width = 'col-sm-4';
+                break;
+        }
+
+        $this->column_width = $width;
+    }
+
     public function setYear()
     {
         $this->year = request('year', Date::now()->year);
diff --git a/public/css/akaunting-color.css b/public/css/akaunting-color.css
index f0b33e61d..514b7edaa 100644
--- a/public/css/akaunting-color.css
+++ b/public/css/akaunting-color.css
@@ -2087,6 +2087,11 @@ div.required .form-control-label:not(span):after, td.required:after
     box-shadow: rgba(248, 248, 255) 0 0 0 1px, rgba(248, 248, 255) 0 4px 16px;
 }
 
+.btn-icon-clipboard:focus
+{
+    outline: none;
+}
+
 /*--Settings Board Icon Color--*/
 .btn-icon-clipboard i
 {
@@ -2323,7 +2328,7 @@ option:focus
 /*--------Login Card Background Color Finish--------*/
 
 
-/*--------General Progress Bar Color--------*/
+/*--General Progress Bar Color---*/
 #nprogress .bar
 {
     background: #3f3c72 !important;
@@ -2340,10 +2345,10 @@ option:focus
 {
     box-shadow: 0 0 10px #3f3c72, 0 0 5px #3f3c72 !important;
 }
-/*--------General Progress Bar Color Finish--------*/
+/*--General Progress Bar Color Finish---*/
 
 
-/*--------List Group Item Active-------*/
+/*--List Group Item Active---*/
 .list-group-item.active
 {
     z-index: 2;
@@ -2351,7 +2356,7 @@ option:focus
     background-color: #3c3f72 !important;
     border-color: #3c3f72 !important;
 }
-/*--------List Group Item Active Finish-------*/
+/*--List Group Item Active Finish---*/
 
 
 /*--Wizard Delete Button Text--*/
diff --git a/public/css/custom.css b/public/css/custom.css
index b4d5d9c4b..98f8ec13e 100644
--- a/public/css/custom.css
+++ b/public/css/custom.css
@@ -526,7 +526,6 @@ button:focus
     box-shadow: none !important;
 }
 /*--------Shadow None Focus Finish--------*/
-
 /*--------Settings Index Page Finish--------*/
 
 
@@ -637,8 +636,19 @@ table .align-items-center td span.badge
 /*--------Report Column--------*/
 .report-column
 {
-    max-width: 100px;
-    width: 160px !important;
+    -webkit-box-flex: 0;
+    -ms-flex: 0 0 6.66%;
+    flex: 0 0 6.66%;
+    max-width: 6.66%;
+}
+
+.head_report_column
+{
+    -webkit-box-flex: 0;
+    -ms-flex: 0 0 10%;
+    flex: 0 0 10%;
+    width: 10%;
+    max-width: 10%;
 }
 /*--------Report Column Finish--------*/
 
diff --git a/public/css/print.css b/public/css/print.css
index f507e508f..2114b3308 100644
--- a/public/css/print.css
+++ b/public/css/print.css
@@ -141,6 +141,11 @@ th, td
     float: right !important;
 }
 
+.font-size-unset
+{
+    font-size: unset;
+}
+
 .text
 {
     color: #3c3f72;
diff --git a/resources/views/partials/reports/table/footer.blade.php b/resources/views/partials/reports/table/footer.blade.php
index 32c99027a..80a92d73b 100644
--- a/resources/views/partials/reports/table/footer.blade.php
+++ b/resources/views/partials/reports/table/footer.blade.php
@@ -1,11 +1,11 @@
 <tfoot>
-    <tr class="rp-border-top-1">
-        <th class="report-column text-left text-uppercase">{{ trans_choice('general.totals', 1) }}</th>
+    <tr class="row rp-border-top-1 font-size-unset px-3">
+        <th class="{{ $class->head_column_width }} text-uppercase">{{ trans_choice('general.totals', 1) }}</th>
         @php $grand_total = 0; @endphp
         @foreach($class->footer_totals[$table] as $total)
             @php $grand_total += $total; @endphp
-            <th class="report-column text-right px-0">@money($total, setting('default.currency'), true)</th>
+            <th class="{{ $class->column_width }}">@money($total, setting('default.currency'), true)</th>
         @endforeach
-        <th class="report-column text-right">@money($grand_total, setting('default.currency'), true)</th>
+        <th class="{{ $class->head_column_width }}">@money($grand_total, setting('default.currency'), true)</th>
     </tr>
 </tfoot>
diff --git a/resources/views/partials/reports/table/header.blade.php b/resources/views/partials/reports/table/header.blade.php
index e56d91cae..f3d447ac0 100644
--- a/resources/views/partials/reports/table/header.blade.php
+++ b/resources/views/partials/reports/table/header.blade.php
@@ -1,13 +1,13 @@
 <thead class="thead-light">
-    <tr>
+    <tr class="row font-size-unset">
         @if (($table == 'default') && !empty($class->groups))
-            <th>{{ $class->groups[$class->model->settings->group] }}</th>
+            <th class="{{ $class->head_column_width }}">{{ $class->groups[$class->model->settings->group] }}</th>
         @else
-            <th>{{ $table }}</th>
+            <th class="{{ $class->head_column_width }}">{{ $table }}</th>
         @endif
         @foreach($class->dates as $date)
-            <th class="text-right px-0">{{ $date }}</th>
+            <th class="{{ $class->column_width }}">{{ $date }}</th>
         @endforeach
-        <th class="text-right">{{ trans_choice('general.totals', 1) }}</th>
+        <th class="{{ $class->head_column_width }}">{{ trans_choice('general.totals', 1) }}</th>
     </tr>
 </thead>
diff --git a/resources/views/partials/reports/table/rows.blade.php b/resources/views/partials/reports/table/rows.blade.php
index 68ac59682..0b869bcc3 100644
--- a/resources/views/partials/reports/table/rows.blade.php
+++ b/resources/views/partials/reports/table/rows.blade.php
@@ -1,9 +1,9 @@
 @php $row_total = 0; @endphp
-<tr class="rp-border-top-1">
-    <td class="report-column" style="padding-left:{{ $class->indents['table_rows'] }}">{{ $class->row_names[$table][$id] }}</td>
+<tr class="row rp-border-top-1 font-size-unset">
+    <td class="{{ $class->head_column_width }}">{{ $class->row_names[$table][$id] }}</td>
     @foreach($rows as $row)
         @php $row_total += $row; @endphp
-        <td class="report-column text-right px-0">@money($row, setting('default.currency'), true)</td>
+        <td class="{{ $class->column_width }}">@money($row, setting('default.currency'), true)</td>
     @endforeach
-    <td class="report-column text-right">@money($row_total, setting('default.currency'), true)</td>
+    <td class="{{ $class->head_column_width }}">@money($row_total, setting('default.currency'), true)</td>
 </tr>
diff --git a/resources/views/reports/profit_loss/content/footer.blade.php b/resources/views/reports/profit_loss/content/footer.blade.php
index 713c2f314..73371afab 100644
--- a/resources/views/reports/profit_loss/content/footer.blade.php
+++ b/resources/views/reports/profit_loss/content/footer.blade.php
@@ -1,12 +1,12 @@
 <div class="table-responsive overflow-auto my-4">
     <table class="table table-hover align-items-center rp-border-collapse">
         <tfoot class="border-top-style">
-            <tr class="rp-border-top-1">
-                <th class="report-column text-uppercase text-left text-nowrap">{{ trans('reports.net_profit') }}</th>
+            <tr class="row rp-border-top-1 font-size-unset px-3">
+                <th class="{{ $class->head_column_width }} text-uppercase text-nowrap">{{ trans('reports.net_profit') }}</th>
                 @foreach($class->net_profit as $profit)
-                    <th class="report-column text-right px-0">@money($profit, setting('default.currency'), true)</th>
+                    <th class="{{ $class->column_width }}">@money($profit, setting('default.currency'), true)</th>
                 @endforeach
-                <th class="report-column text-right">
+                <th class="{{ $class->head_column_width }}">
                     @money(array_sum($class->net_profit), setting('default.currency'), true)
                 </th>
             </tr>
diff --git a/resources/views/reports/profit_loss/content/header.blade.php b/resources/views/reports/profit_loss/content/header.blade.php
index 8b700c307..e4318f3cf 100644
--- a/resources/views/reports/profit_loss/content/header.blade.php
+++ b/resources/views/reports/profit_loss/content/header.blade.php
@@ -1,12 +1,12 @@
 <div class="table-responsive overflow-auto mt-4">
     <table class="table table-hover align-items-center rp-border-collapse">
         <thead class="border-top-style">
-            <tr class="rp-border-bottom-1">
-                <th class="report-column text-right"></th>
+            <tr class="row rp-border-bottom-1 font-size-unset px-3">
+                <th class="{{ $class->head_column_width }}"></th>
                 @foreach($class->dates as $date)
-                    <th class="report-column text-right px-0">{{ $date }}</th>
+                    <th class="{{ $class->column_width }}">{{ $date }}</th>
                 @endforeach
-                <th class="report-column text-right text-uppercase">
+                <th class="{{ $class->head_column_width }} text-uppercase">
                     {{ trans_choice('general.totals', 1) }}
                 </th>
             </tr>
diff --git a/resources/views/reports/profit_loss/table/footer.blade.php b/resources/views/reports/profit_loss/table/footer.blade.php
index 7d3b1e01c..261cda330 100644
--- a/resources/views/reports/profit_loss/table/footer.blade.php
+++ b/resources/views/reports/profit_loss/table/footer.blade.php
@@ -1,11 +1,11 @@
 <tfoot>
-    <tr class="rp-border-top-1">
-        <th class="report-column text-left text-uppercase">{{ trans_choice('general.totals', 1) }}</th>
+    <tr class="row rp-border-top-1 font-size-unset px-3">
+        <th class="{{ $class->head_column_width }} text-uppercase">{{ trans_choice('general.totals', 1) }}</th>
         @php $grand_total = 0; @endphp
         @foreach($class->footer_totals[$table] as $date => $total)
             @php $grand_total += $total; @endphp
-            <th class="report-column text-right px-0">@money($total, setting('default.currency'), true)</th>
+            <th class="{{ $class->column_width }}">@money($total, setting('default.currency'), true)</th>
         @endforeach
-        <th class="report-column text-right">@money($grand_total, setting('default.currency'), true)</th>
+        <th class="{{ $class->head_column_width }}">@money($grand_total, setting('default.currency'), true)</th>
     </tr>
 </tfoot>

From 08f349c42ccd6a27ef2552605b0cbe2a70d4a190 Mon Sep 17 00:00:00 2001
From: denisdulici <denisdulici@gmail.com>
Date: Mon, 9 Mar 2020 18:07:16 +0300
Subject: [PATCH 27/65] fixed currency conversion

---
 app/Abstracts/DocumentModel.php               |  4 +-
 app/Http/Controllers/Portal/Invoices.php      |  4 +-
 app/Http/Controllers/Purchases/Bills.php      |  2 +-
 app/Http/Controllers/Sales/Invoices.php       |  2 +-
 .../Banking/CreateDocumentTransaction.php     |  8 ++--
 app/Jobs/Banking/CreateTransfer.php           |  4 +-
 app/Jobs/Banking/UpdateTransfer.php           |  4 +-
 app/Models/Banking/Transaction.php            |  5 ---
 app/Traits/Currencies.php                     | 38 +++++--------------
 composer.json                                 |  2 +-
 10 files changed, 24 insertions(+), 49 deletions(-)

diff --git a/app/Abstracts/DocumentModel.php b/app/Abstracts/DocumentModel.php
index c0c7896c0..efd540783 100644
--- a/app/Abstracts/DocumentModel.php
+++ b/app/Abstracts/DocumentModel.php
@@ -98,7 +98,7 @@ abstract class DocumentModel extends Model
                     $default_model->currency_code = $item->currency_code;
                     $default_model->currency_rate = $currencies[$item->currency_code];
 
-                    $default_amount = (double) $default_model->getDivideConvertedAmount();
+                    $default_amount = (double) $default_model->getAmountConvertedToDefault();
 
                     $convert_model = new Transaction();
                     $convert_model->default_currency_code = $item->currency_code;
@@ -106,7 +106,7 @@ abstract class DocumentModel extends Model
                     $convert_model->currency_code = $this->currency_code;
                     $convert_model->currency_rate = $currencies[$this->currency_code];
 
-                    $amount = (double) $convert_model->getAmountConvertedFromCustomDefault();
+                    $amount = (double) $convert_model->getAmountConvertedFromDefault();
                 }
 
                 $paid += $amount;
diff --git a/app/Http/Controllers/Portal/Invoices.php b/app/Http/Controllers/Portal/Invoices.php
index 4abaf5803..24cb48447 100644
--- a/app/Http/Controllers/Portal/Invoices.php
+++ b/app/Http/Controllers/Portal/Invoices.php
@@ -100,7 +100,7 @@ class Invoices extends Controller
             if ($invoice->currency_code != $item->currency_code) {
                 $item->default_currency_code = $invoice->currency_code;
 
-                $amount = $item->getAmountConvertedFromCustomDefault();
+                $amount = $item->getAmountConvertedFromDefault();
             }
 
             $paid += $amount;
@@ -129,7 +129,7 @@ class Invoices extends Controller
             if ($invoice->currency_code != $item->currency_code) {
                 $item->default_currency_code = $invoice->currency_code;
 
-                $amount = $item->getAmountConvertedFromCustomDefault();
+                $amount = $item->getAmountConvertedFromDefault();
             }
 
             $paid += $amount;
diff --git a/app/Http/Controllers/Purchases/Bills.php b/app/Http/Controllers/Purchases/Bills.php
index e56108269..661445943 100644
--- a/app/Http/Controllers/Purchases/Bills.php
+++ b/app/Http/Controllers/Purchases/Bills.php
@@ -371,7 +371,7 @@ class Bills extends Controller
             if ($bill->currency_code != $item->currency_code) {
                 $item->default_currency_code = $bill->currency_code;
 
-                $amount = $item->getAmountConvertedFromCustomDefault();
+                $amount = $item->getAmountConvertedFromDefault();
             }
 
             $paid += $amount;
diff --git a/app/Http/Controllers/Sales/Invoices.php b/app/Http/Controllers/Sales/Invoices.php
index 66eda1591..38a2d66e2 100644
--- a/app/Http/Controllers/Sales/Invoices.php
+++ b/app/Http/Controllers/Sales/Invoices.php
@@ -447,7 +447,7 @@ class Invoices extends Controller
             if ($invoice->currency_code != $item->currency_code) {
                 $item->default_currency_code = $invoice->currency_code;
 
-                $amount = $item->getAmountConvertedFromCustomDefault();
+                $amount = $item->getAmountConvertedFromDefault();
             }
 
             $paid += $amount;
diff --git a/app/Jobs/Banking/CreateDocumentTransaction.php b/app/Jobs/Banking/CreateDocumentTransaction.php
index 201c7a526..400f59d47 100644
--- a/app/Jobs/Banking/CreateDocumentTransaction.php
+++ b/app/Jobs/Banking/CreateDocumentTransaction.php
@@ -92,7 +92,7 @@ class CreateDocumentTransaction extends Job
             $default_amount_model->currency_code         = $this->request['currency_code'];
             $default_amount_model->currency_rate         = $currencies[$this->request['currency_code']];
 
-            $default_amount = (double) $default_amount_model->getDivideConvertedAmount();
+            $default_amount = (double) $default_amount_model->getAmountConvertedToDefault();
 
             $convert_amount_model = new Transaction();
             $convert_amount_model->default_currency_code = $this->request['currency_code'];
@@ -100,7 +100,7 @@ class CreateDocumentTransaction extends Job
             $convert_amount_model->currency_code = $this->model->currency_code;
             $convert_amount_model->currency_rate = $currencies[$this->model->currency_code];
 
-            $amount = (double) $convert_amount_model->getAmountConvertedFromCustomDefault();
+            $amount = (double) $convert_amount_model->getAmountConvertedFromDefault();
         }
 
         $total_amount -= $this->model->paid;
@@ -126,7 +126,7 @@ class CreateDocumentTransaction extends Job
                 $error_amount_model->currency_code         = $this->model->currency_code;
                 $error_amount_model->currency_rate         = $currencies[$this->model->currency_code];
 
-                $error_amount = (double) $error_amount_model->getDivideConvertedAmount();
+                $error_amount = (double) $error_amount_model->getAmountConvertedToDefault();
 
                 $convert_amount_model = new Transaction();
                 $convert_amount_model->default_currency_code = $this->model->currency_code;
@@ -134,7 +134,7 @@ class CreateDocumentTransaction extends Job
                 $convert_amount_model->currency_code = $this->request['currency_code'];
                 $convert_amount_model->currency_rate = $currencies[$this->request['currency_code']];
 
-                $error_amount = (double) $convert_amount_model->getAmountConvertedFromCustomDefault();
+                $error_amount = (double) $convert_amount_model->getAmountConvertedFromDefault();
             }
 
             $message = trans('messages.error.over_payment', ['amount' => money($error_amount, $this->request['currency_code'], true)]);
diff --git a/app/Jobs/Banking/CreateTransfer.php b/app/Jobs/Banking/CreateTransfer.php
index 9c93e53d8..1daaac4a6 100644
--- a/app/Jobs/Banking/CreateTransfer.php
+++ b/app/Jobs/Banking/CreateTransfer.php
@@ -64,7 +64,7 @@ class CreateTransfer extends Job
                 $default_amount_model->currency_code = $expense_currency_code;
                 $default_amount_model->currency_rate = $currencies[$expense_currency_code];
 
-                $default_amount = $default_amount_model->getAmountDivided();
+                $default_amount = $default_amount_model->getAmountConvertedToDefault();
             }
 
             $transfer_amount = new Transfer();
@@ -74,7 +74,7 @@ class CreateTransfer extends Job
             $transfer_amount->currency_code = $income_currency_code;
             $transfer_amount->currency_rate = $currencies[$income_currency_code];
 
-            $amount = $transfer_amount->getAmountConvertedFromCustomDefault();
+            $amount = $transfer_amount->getAmountConvertedFromDefault();
         } else {
             $amount = $this->request->get('amount');
         }
diff --git a/app/Jobs/Banking/UpdateTransfer.php b/app/Jobs/Banking/UpdateTransfer.php
index 99a887042..4437936e2 100644
--- a/app/Jobs/Banking/UpdateTransfer.php
+++ b/app/Jobs/Banking/UpdateTransfer.php
@@ -71,7 +71,7 @@ class UpdateTransfer extends Job
                 $default_amount_model->currency_code = $expense_currency_code;
                 $default_amount_model->currency_rate = $currencies[$expense_currency_code];
 
-                $default_amount = $default_amount_model->getDivideConvertedAmount();
+                $default_amount = $default_amount_model->getAmountConvertedToDefault();
             }
 
             $transfer_amount = new Transfer();
@@ -81,7 +81,7 @@ class UpdateTransfer extends Job
             $transfer_amount->currency_code = $income_currency_code;
             $transfer_amount->currency_rate = $currencies[$income_currency_code];
 
-            $amount = $transfer_amount->getAmountConvertedFromCustomDefault();
+            $amount = $transfer_amount->getAmountConvertedFromDefault();
         } else {
             $amount = $this->request->get('amount');
         }
diff --git a/app/Models/Banking/Transaction.php b/app/Models/Banking/Transaction.php
index ffd3395a0..c33afb47c 100644
--- a/app/Models/Banking/Transaction.php
+++ b/app/Models/Banking/Transaction.php
@@ -211,9 +211,4 @@ class Transaction extends Model
 
         return $this->getMedia('attachment')->last();
     }
-
-    public function getDivideConvertedAmount($format = false)
-    {
-        return $this->divide($this->amount, $this->currency_code, $this->currency_rate, $format);
-    }
 }
diff --git a/app/Traits/Currencies.php b/app/Traits/Currencies.php
index 48693ddaa..09a6579cb 100644
--- a/app/Traits/Currencies.php
+++ b/app/Traits/Currencies.php
@@ -3,46 +3,31 @@
 namespace App\Traits;
 
 use Akaunting\Money\Money;
-use Akaunting\Money\Currency;
 
 trait Currencies
 {
-    public function convert($amount, $from, $to, $rate, $format = false)
+    public function convert($method, $amount, $from, $to, $rate, $format = false)
     {
-        $money = Money::$from($amount, $format);
+        $money = Money::$to($amount, $format);
 
         // No need to convert same currency
         if ($from == $to) {
             return $format ? $money->format() : $money->getAmount();
         }
 
-        $money = $money->convert(new Currency($to), (double) $rate);
+        $money = $money->$method((double) $rate);
 
         return $format ? $money->format() : $money->getAmount();
     }
 
-    public function divide($amount, $code, $rate, $format = false)
-    {
-        $money = Money::$code($amount, $format);
-
-        $money = $money->divide((double) $rate);
-
-        return $format ? $money->format() : $money->getAmount();
-    }
-
-    public function getAmount($with_tax = true)
-    {
-        return $with_tax ? $this->amount : (isset($this->amount_without_tax) ? $this->amount_without_tax : $this->amount);
-    }
-
     public function convertToDefault($amount, $from, $rate, $format = false)
     {
-        return $this->convert($amount, $from, $this->getDefaultCurrency(), $rate, $format);
+        return $this->convert('divide', $amount, $from, $this->getDefaultCurrency(), $rate, $format);
     }
 
     public function convertFromDefault($amount, $to, $rate, $format = false)
     {
-        return $this->convert($amount, $this->getDefaultCurrency(), $to, $rate, $format);
+        return $this->convert('multiply', $amount, $this->getDefaultCurrency(), $to, $rate, $format);
     }
 
     public function getAmountConvertedToDefault($format = false, $with_tax = true)
@@ -55,18 +40,13 @@ trait Currencies
         return $this->convertFromDefault($this->getAmount($with_tax), $this->currency_code, $this->currency_rate, $format);
     }
 
-    public function getAmountConvertedFromCustomDefault($format = false, $with_tax = true)
+    public function getAmount($with_tax = true)
     {
-        return $this->convert($this->getAmount($with_tax), $this->default_currency_code, $this->currency_code, $this->currency_rate, $format);
+        return $with_tax ? $this->amount : (isset($this->amount_without_tax) ? $this->amount_without_tax : $this->amount);
     }
 
-    public function getAmountDivided($format = false, $with_tax = true)
+    public function getDefaultCurrency()
     {
-        return $this->divide($this->getAmount($with_tax), $this->currency_code, $this->currency_rate, $format);
-    }
-
-    protected function getDefaultCurrency()
-    {
-        return setting('default.currency', 'USD');
+        return !empty($this->default_currency_code) ? $this->default_currency_code : setting('default.currency', 'USD');
     }
 }
diff --git a/composer.json b/composer.json
index f5deaa9c3..d9baa9b04 100644
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
         "akaunting/language": "1.0.*",
         "akaunting/menu": "1.0.*",
         "akaunting/module": "1.0.*",
-        "akaunting/money": "1.0.*",
+        "akaunting/money": "1.1.*",
         "akaunting/setting": "1.1.*",
         "akaunting/version": "1.0.*",
         "barryvdh/laravel-debugbar": "3.2.*",

From ca5750b1e3521e526010ea7a3f9c10fa6cdea7ba Mon Sep 17 00:00:00 2001
From: denisdulici <denisdulici@gmail.com>
Date: Tue, 10 Mar 2020 11:26:34 +0300
Subject: [PATCH 28/65] formatting

---
 app/Models/Common/Contact.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Models/Common/Contact.php b/app/Models/Common/Contact.php
index 109762bf6..632c0a97d 100644
--- a/app/Models/Common/Contact.php
+++ b/app/Models/Common/Contact.php
@@ -114,7 +114,7 @@ class Contact extends Model
         $this->$collection()->accrued()->notPaid()->each(function ($item) use (&$amount) {
             $unpaid = $item->amount - $item->paid;
 
-            $amount += $this->convertFromDefault($unpaid, $item->currency_code, $item->currency_rate, false);
+            $amount += $this->convertFromDefault($unpaid, $item->currency_code, $item->currency_rate);
         });
 
         return $amount;

From 5e82e510a1bd03a4fdf8756757803b41fad14421 Mon Sep 17 00:00:00 2001
From: batuhanbas <b1atuhanb1as@gmail.com>
Date: Tue, 10 Mar 2020 12:31:10 +0300
Subject: [PATCH 29/65] forgotten classes in reports

---
 resources/views/partials/reports/table/footer.blade.php     | 4 ++--
 resources/views/partials/reports/table/header.blade.php     | 4 ++--
 resources/views/partials/reports/table/rows.blade.php       | 4 ++--
 .../views/reports/profit_loss/content/footer.blade.php      | 4 ++--
 .../views/reports/profit_loss/content/header.blade.php      | 6 +++---
 resources/views/reports/profit_loss/table/footer.blade.php  | 4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/resources/views/partials/reports/table/footer.blade.php b/resources/views/partials/reports/table/footer.blade.php
index 80a92d73b..aae77f330 100644
--- a/resources/views/partials/reports/table/footer.blade.php
+++ b/resources/views/partials/reports/table/footer.blade.php
@@ -4,8 +4,8 @@
         @php $grand_total = 0; @endphp
         @foreach($class->footer_totals[$table] as $total)
             @php $grand_total += $total; @endphp
-            <th class="{{ $class->column_width }}">@money($total, setting('default.currency'), true)</th>
+            <th class="{{ $class->column_width }} text-right px-0">@money($total, setting('default.currency'), true)</th>
         @endforeach
-        <th class="{{ $class->head_column_width }}">@money($grand_total, setting('default.currency'), true)</th>
+        <th class="{{ $class->head_column_width }} text-right">@money($grand_total, setting('default.currency'), true)</th>
     </tr>
 </tfoot>
diff --git a/resources/views/partials/reports/table/header.blade.php b/resources/views/partials/reports/table/header.blade.php
index f3d447ac0..e4dfb3bc1 100644
--- a/resources/views/partials/reports/table/header.blade.php
+++ b/resources/views/partials/reports/table/header.blade.php
@@ -6,8 +6,8 @@
             <th class="{{ $class->head_column_width }}">{{ $table }}</th>
         @endif
         @foreach($class->dates as $date)
-            <th class="{{ $class->column_width }}">{{ $date }}</th>
+            <th class="{{ $class->column_width }} text-right px-0">{{ $date }}</th>
         @endforeach
-        <th class="{{ $class->head_column_width }}">{{ trans_choice('general.totals', 1) }}</th>
+        <th class="{{ $class->head_column_width }} text-right">{{ trans_choice('general.totals', 1) }}</th>
     </tr>
 </thead>
diff --git a/resources/views/partials/reports/table/rows.blade.php b/resources/views/partials/reports/table/rows.blade.php
index 0b869bcc3..5b62bebc8 100644
--- a/resources/views/partials/reports/table/rows.blade.php
+++ b/resources/views/partials/reports/table/rows.blade.php
@@ -3,7 +3,7 @@
     <td class="{{ $class->head_column_width }}">{{ $class->row_names[$table][$id] }}</td>
     @foreach($rows as $row)
         @php $row_total += $row; @endphp
-        <td class="{{ $class->column_width }}">@money($row, setting('default.currency'), true)</td>
+        <td class="{{ $class->column_width }} text-right px-0">@money($row, setting('default.currency'), true)</td>
     @endforeach
-    <td class="{{ $class->head_column_width }}">@money($row_total, setting('default.currency'), true)</td>
+    <td class="{{ $class->head_column_width }} text-right">@money($row_total, setting('default.currency'), true)</td>
 </tr>
diff --git a/resources/views/reports/profit_loss/content/footer.blade.php b/resources/views/reports/profit_loss/content/footer.blade.php
index 73371afab..f7091fb6b 100644
--- a/resources/views/reports/profit_loss/content/footer.blade.php
+++ b/resources/views/reports/profit_loss/content/footer.blade.php
@@ -4,9 +4,9 @@
             <tr class="row rp-border-top-1 font-size-unset px-3">
                 <th class="{{ $class->head_column_width }} text-uppercase text-nowrap">{{ trans('reports.net_profit') }}</th>
                 @foreach($class->net_profit as $profit)
-                    <th class="{{ $class->column_width }}">@money($profit, setting('default.currency'), true)</th>
+                    <th class="{{ $class->column_width }} text-right px-0">@money($profit, setting('default.currency'), true)</th>
                 @endforeach
-                <th class="{{ $class->head_column_width }}">
+                <th class="{{ $class->head_column_width }} text-right">
                     @money(array_sum($class->net_profit), setting('default.currency'), true)
                 </th>
             </tr>
diff --git a/resources/views/reports/profit_loss/content/header.blade.php b/resources/views/reports/profit_loss/content/header.blade.php
index e4318f3cf..d67f42022 100644
--- a/resources/views/reports/profit_loss/content/header.blade.php
+++ b/resources/views/reports/profit_loss/content/header.blade.php
@@ -2,11 +2,11 @@
     <table class="table table-hover align-items-center rp-border-collapse">
         <thead class="border-top-style">
             <tr class="row rp-border-bottom-1 font-size-unset px-3">
-                <th class="{{ $class->head_column_width }}"></th>
+                <th class="{{ $class->head_column_width }} text-right px-0"></th>
                 @foreach($class->dates as $date)
-                    <th class="{{ $class->column_width }}">{{ $date }}</th>
+                    <th class="{{ $class->column_width }} text-right px-0">{{ $date }}</th>
                 @endforeach
-                <th class="{{ $class->head_column_width }} text-uppercase">
+                <th class="{{ $class->head_column_width }} text-uppercase text-right">
                     {{ trans_choice('general.totals', 1) }}
                 </th>
             </tr>
diff --git a/resources/views/reports/profit_loss/table/footer.blade.php b/resources/views/reports/profit_loss/table/footer.blade.php
index 261cda330..92cc749f3 100644
--- a/resources/views/reports/profit_loss/table/footer.blade.php
+++ b/resources/views/reports/profit_loss/table/footer.blade.php
@@ -4,8 +4,8 @@
         @php $grand_total = 0; @endphp
         @foreach($class->footer_totals[$table] as $date => $total)
             @php $grand_total += $total; @endphp
-            <th class="{{ $class->column_width }}">@money($total, setting('default.currency'), true)</th>
+            <th class="{{ $class->column_width }} text-right px-0">@money($total, setting('default.currency'), true)</th>
         @endforeach
-        <th class="{{ $class->head_column_width }}">@money($grand_total, setting('default.currency'), true)</th>
+        <th class="{{ $class->head_column_width }} text-right">@money($grand_total, setting('default.currency'), true)</th>
     </tr>
 </tfoot>

From 1d08c0ea80d4b818ec031728981d05b64d49543b Mon Sep 17 00:00:00 2001
From: batuhanbas <b1atuhanb1as@gmail.com>
Date: Tue, 10 Mar 2020 14:54:20 +0300
Subject: [PATCH 30/65] report function usage updated

---
 app/Abstracts/Report.php                      | 37 +++++--------------
 public/css/custom.css                         | 18 ++++-----
 .../partials/reports/table/footer.blade.php   |  6 +--
 .../partials/reports/table/header.blade.php   |  8 ++--
 .../partials/reports/table/rows.blade.php     |  6 +--
 .../profit_loss/content/footer.blade.php      |  8 ++--
 .../profit_loss/content/header.blade.php      |  6 +--
 .../profit_loss/table/footer.blade.php        |  8 ++--
 8 files changed, 40 insertions(+), 57 deletions(-)

diff --git a/app/Abstracts/Report.php b/app/Abstracts/Report.php
index a4a8d0064..9b16044a3 100644
--- a/app/Abstracts/Report.php
+++ b/app/Abstracts/Report.php
@@ -67,8 +67,8 @@ abstract class Report
         'datasets' => [],
     ];
 
-    public $column_width = 'report-column';
-    public $head_column_width = 'head_report_column';
+    public $column_name_width = 'report-column-name';
+    public $column_value_width = 'report-column-value';
 
     public function __construct(Model $model = null, $load_data = true)
     {
@@ -79,8 +79,6 @@ abstract class Report
         }
 
         $this->model = $model;
-        $this->setHeadColumnWidth();
-        $this->setDataColumnWidth();
 
         if (!$load_data) {
             return;
@@ -100,6 +98,7 @@ abstract class Report
         $this->setFilters();
         $this->setRows();
         $this->setData();
+        $this->setColumnWidth();
 
         $this->loaded = true;
     }
@@ -203,33 +202,13 @@ abstract class Report
         return \Excel::download(new Export($this->views['content'], $this), \Str::filename($this->model->name) . '.xlsx');
     }
 
-    public function setHeadColumnWidth()
+    public function setColumnWidth()
     {
         if (empty($this->model->settings->period)) {
             return;
         }
 
-        $head_width = 'head_report_column';
-
-        switch ($this->model->settings->period) {
-            case 'quarterly':
-                $head_width = 'col-sm-2';
-                break;
-            case 'yearly':
-                $head_width = 'col-sm-4';
-                break;
-        }
-
-        $this->head_column_width = $head_width;
-    }
-
-    public function setDataColumnWidth()
-    {
-        if (empty($this->model->settings->period)) {
-            return;
-        }
-
-        $width = 'report-column';
+        $width = '';
 
         switch ($this->model->settings->period) {
             case 'quarterly':
@@ -240,7 +219,11 @@ abstract class Report
                 break;
         }
 
-        $this->column_width = $width;
+        if (empty($width)) {
+            return;
+        }
+
+        $this->column_name_width = $this->column_value_width = $width;
     }
 
     public function setYear()
diff --git a/public/css/custom.css b/public/css/custom.css
index 98f8ec13e..62dbd3de2 100644
--- a/public/css/custom.css
+++ b/public/css/custom.css
@@ -634,15 +634,7 @@ table .align-items-center td span.badge
 
 
 /*--------Report Column--------*/
-.report-column
-{
-    -webkit-box-flex: 0;
-    -ms-flex: 0 0 6.66%;
-    flex: 0 0 6.66%;
-    max-width: 6.66%;
-}
-
-.head_report_column
+.report-column-name
 {
     -webkit-box-flex: 0;
     -ms-flex: 0 0 10%;
@@ -650,6 +642,14 @@ table .align-items-center td span.badge
     width: 10%;
     max-width: 10%;
 }
+
+.report-column-value
+{
+    -webkit-box-flex: 0;
+    -ms-flex: 0 0 6.66%;
+    flex: 0 0 6.66%;
+    max-width: 6.66%;
+}
 /*--------Report Column Finish--------*/
 
 
diff --git a/resources/views/partials/reports/table/footer.blade.php b/resources/views/partials/reports/table/footer.blade.php
index aae77f330..7464aa6b6 100644
--- a/resources/views/partials/reports/table/footer.blade.php
+++ b/resources/views/partials/reports/table/footer.blade.php
@@ -1,11 +1,11 @@
 <tfoot>
     <tr class="row rp-border-top-1 font-size-unset px-3">
-        <th class="{{ $class->head_column_width }} text-uppercase">{{ trans_choice('general.totals', 1) }}</th>
+        <th class="{{ $class->column_name_width }} text-uppercase">{{ trans_choice('general.totals', 1) }}</th>
         @php $grand_total = 0; @endphp
         @foreach($class->footer_totals[$table] as $total)
             @php $grand_total += $total; @endphp
-            <th class="{{ $class->column_width }} text-right px-0">@money($total, setting('default.currency'), true)</th>
+            <th class="{{ $class->column_value_width }} text-right px-0">@money($total, setting('default.currency'), true)</th>
         @endforeach
-        <th class="{{ $class->head_column_width }} text-right">@money($grand_total, setting('default.currency'), true)</th>
+        <th class="{{ $class->column_name_width }} text-right">@money($grand_total, setting('default.currency'), true)</th>
     </tr>
 </tfoot>
diff --git a/resources/views/partials/reports/table/header.blade.php b/resources/views/partials/reports/table/header.blade.php
index e4dfb3bc1..c4d0edd32 100644
--- a/resources/views/partials/reports/table/header.blade.php
+++ b/resources/views/partials/reports/table/header.blade.php
@@ -1,13 +1,13 @@
 <thead class="thead-light">
     <tr class="row font-size-unset">
         @if (($table == 'default') && !empty($class->groups))
-            <th class="{{ $class->head_column_width }}">{{ $class->groups[$class->model->settings->group] }}</th>
+            <th class="{{ $class->column_name_width }}">{{ $class->groups[$class->model->settings->group] }}</th>
         @else
-            <th class="{{ $class->head_column_width }}">{{ $table }}</th>
+            <th class="{{ $class->column_name_width }}">{{ $table }}</th>
         @endif
         @foreach($class->dates as $date)
-            <th class="{{ $class->column_width }} text-right px-0">{{ $date }}</th>
+            <th class="{{ $class->column_value_width }} text-right px-0">{{ $date }}</th>
         @endforeach
-        <th class="{{ $class->head_column_width }} text-right">{{ trans_choice('general.totals', 1) }}</th>
+        <th class="{{ $class->column_name_width }} text-right">{{ trans_choice('general.totals', 1) }}</th>
     </tr>
 </thead>
diff --git a/resources/views/partials/reports/table/rows.blade.php b/resources/views/partials/reports/table/rows.blade.php
index 5b62bebc8..9ae064ea4 100644
--- a/resources/views/partials/reports/table/rows.blade.php
+++ b/resources/views/partials/reports/table/rows.blade.php
@@ -1,9 +1,9 @@
 @php $row_total = 0; @endphp
 <tr class="row rp-border-top-1 font-size-unset">
-    <td class="{{ $class->head_column_width }}">{{ $class->row_names[$table][$id] }}</td>
+    <td class="{{ $class->column_name_width }}">{{ $class->row_names[$table][$id] }}</td>
     @foreach($rows as $row)
         @php $row_total += $row; @endphp
-        <td class="{{ $class->column_width }} text-right px-0">@money($row, setting('default.currency'), true)</td>
+        <td class="{{ $class->column_value_width }} text-right px-0">@money($row, setting('default.currency'), true)</td>
     @endforeach
-    <td class="{{ $class->head_column_width }} text-right">@money($row_total, setting('default.currency'), true)</td>
+    <td class="{{ $class->column_name_width }} text-right">@money($row_total, setting('default.currency'), true)</td>
 </tr>
diff --git a/resources/views/reports/profit_loss/content/footer.blade.php b/resources/views/reports/profit_loss/content/footer.blade.php
index f7091fb6b..0344cba21 100644
--- a/resources/views/reports/profit_loss/content/footer.blade.php
+++ b/resources/views/reports/profit_loss/content/footer.blade.php
@@ -1,12 +1,12 @@
-<div class="table-responsive overflow-auto my-4">
+<div class="table-responsive overflow-auto my-2">
     <table class="table table-hover align-items-center rp-border-collapse">
         <tfoot class="border-top-style">
             <tr class="row rp-border-top-1 font-size-unset px-3">
-                <th class="{{ $class->head_column_width }} text-uppercase text-nowrap">{{ trans('reports.net_profit') }}</th>
+                <th class="{{ $class->column_name_width }} text-uppercase text-nowrap border-top-0">{{ trans('reports.net_profit') }}</th>
                 @foreach($class->net_profit as $profit)
-                    <th class="{{ $class->column_width }} text-right px-0">@money($profit, setting('default.currency'), true)</th>
+                    <th class="{{ $class->column_value_width }} text-right px-0 border-top-0">@money($profit, setting('default.currency'), true)</th>
                 @endforeach
-                <th class="{{ $class->head_column_width }} text-right">
+                <th class="{{ $class->column_name_width }} text-right border-top-0">
                     @money(array_sum($class->net_profit), setting('default.currency'), true)
                 </th>
             </tr>
diff --git a/resources/views/reports/profit_loss/content/header.blade.php b/resources/views/reports/profit_loss/content/header.blade.php
index d67f42022..77bb48802 100644
--- a/resources/views/reports/profit_loss/content/header.blade.php
+++ b/resources/views/reports/profit_loss/content/header.blade.php
@@ -2,11 +2,11 @@
     <table class="table table-hover align-items-center rp-border-collapse">
         <thead class="border-top-style">
             <tr class="row rp-border-bottom-1 font-size-unset px-3">
-                <th class="{{ $class->head_column_width }} text-right px-0"></th>
+                <th class="{{ $class->column_name_width }} text-right px-0 border-top-0"></th>
                 @foreach($class->dates as $date)
-                    <th class="{{ $class->column_width }} text-right px-0">{{ $date }}</th>
+                    <th class="{{ $class->column_value_width }} text-right px-0 border-top-0">{{ $date }}</th>
                 @endforeach
-                <th class="{{ $class->head_column_width }} text-uppercase text-right">
+                <th class="{{ $class->column_name_width }} text-uppercase text-right border-top-0">
                     {{ trans_choice('general.totals', 1) }}
                 </th>
             </tr>
diff --git a/resources/views/reports/profit_loss/table/footer.blade.php b/resources/views/reports/profit_loss/table/footer.blade.php
index 92cc749f3..469f393a5 100644
--- a/resources/views/reports/profit_loss/table/footer.blade.php
+++ b/resources/views/reports/profit_loss/table/footer.blade.php
@@ -1,11 +1,11 @@
 <tfoot>
-    <tr class="row rp-border-top-1 font-size-unset px-3">
-        <th class="{{ $class->head_column_width }} text-uppercase">{{ trans_choice('general.totals', 1) }}</th>
+    <tr class="row rp-border-top-1 font-size-unset px-3 mb-3">
+        <th class="{{ $class->column_name_width }} text-uppercase">{{ trans_choice('general.totals', 1) }}</th>
         @php $grand_total = 0; @endphp
         @foreach($class->footer_totals[$table] as $date => $total)
             @php $grand_total += $total; @endphp
-            <th class="{{ $class->column_width }} text-right px-0">@money($total, setting('default.currency'), true)</th>
+            <th class="{{ $class->column_value_width }} text-right px-0">@money($total, setting('default.currency'), true)</th>
         @endforeach
-        <th class="{{ $class->head_column_width }} text-right">@money($grand_total, setting('default.currency'), true)</th>
+        <th class="{{ $class->column_name_width }} text-right">@money($grand_total, setting('default.currency'), true)</th>
     </tr>
 </tfoot>

From fa3dcd3b25be4dfbf0794796da9db8e0ba984c55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Tue, 10 Mar 2020 15:02:19 +0300
Subject: [PATCH 31/65] invoice and bill item create..

---
 app/Listeners/Update/V20/Version205.php | 100 ++++++++++++++++++++++++
 app/Providers/Event.php                 |   1 +
 2 files changed, 101 insertions(+)
 create mode 100644 app/Listeners/Update/V20/Version205.php

diff --git a/app/Listeners/Update/V20/Version205.php b/app/Listeners/Update/V20/Version205.php
new file mode 100644
index 000000000..3c68064d4
--- /dev/null
+++ b/app/Listeners/Update/V20/Version205.php
@@ -0,0 +1,100 @@
+<?php
+
+namespace App\Listeners\Update\V20;
+
+use App\Abstracts\Listeners\Update as Listener;
+use App\Events\Install\UpdateFinished as Event;
+use Illuminate\Support\Facades\DB;
+
+class Version205 extends Listener
+{
+    const ALIAS = 'core';
+
+    const VERSION = '2.0.5';
+
+    protected $items;
+
+    protected $categories;
+
+    /**
+     * Handle the event.
+     *
+     * @param  $event
+     * @return void
+     */
+    public function handle(Event $event)
+    {
+        if ($this->skipThisUpdate($event)) {
+            return;
+        }
+
+        $this->items = [];
+
+        $this->updateBillItems();
+
+        $this->updateInvoiceItems();
+    }
+
+    protected function updateBillItems()
+    {
+        $bill_items = DB::table('bill_items')->whereNull('deleted_at')->where('item_id', 0)->cursor();
+
+        foreach ($bill_items as $bill_item) {
+            $item_id = $this->getItemId($bill_item);
+
+            DB::table('bill_items')
+                ->where('id', $bill_item->id)
+                ->update(['item_id' => $item_id]);
+        }
+    }
+
+    protected function updateInvoiceItems()
+    {
+        $invoice_items = DB::table('invoice_items')->whereNull('deleted_at')->where('item_id', 0)->cursor();
+
+        foreach ($invoice_items as $invoice_item) {
+            $item_id = $this->getItemId($invoice_item);
+
+            DB::table('invoice_items')
+                ->where('id', $invoice_item->id)
+                ->update(['item_id' => $item_id]);
+
+            DB::table('items')
+                ->where('id', $item_id)
+                ->update(['sales_price' => $invoice_item->price]);
+        }
+    }
+
+    protected function getItemId($item)
+    {
+        // Set category_id for company.
+        if (!isset($this->categories[$item->company_id])) {
+            $this->categories[$item->company_id] = DB::table('categories')->where('company_id', $item->company_id)->where('type', 'item')->first()->id;
+        }
+
+        // Return set item_id for item name.
+        if (isset($this->items[$item->company_id]) && in_array($item->name, $this->items[$item->company_id])) {
+            return array_search($item->name, $this->items[$item->company_id]);
+        }
+
+        // Insert new item.
+        $item_id = DB::table('items')->insertGetId([
+            'company_id' => $item->company_id,
+            'name' => $item->name,
+            'description' => null,
+            'sale_price' => $item->price,
+            'purchase_price' => $item->price,
+            'category_id' => $this->categories[$item->company_id],
+            'tax_id' => null,
+            'enabled' => 1,
+            'created_at' => $item->created_at,
+            'updated_at' => $item->updated_at,
+            'deleted_at' => null,
+        ]);
+
+        // Set item_id for item name.
+        $this->items[$item->company_id][$item_id] = $item->name;
+
+        return $item_id;
+    }
+}
diff --git a/app/Providers/Event.php b/app/Providers/Event.php
index 42d2af107..22c0704ec 100644
--- a/app/Providers/Event.php
+++ b/app/Providers/Event.php
@@ -16,6 +16,7 @@ class Event extends Provider
             'App\Listeners\Update\CreateModuleUpdatedHistory',
             'App\Listeners\Update\V20\Version200',
             'App\Listeners\Update\V20\Version203',
+            'App\Listeners\Update\V20\Version205',
         ],
         'Illuminate\Auth\Events\Login' => [
             'App\Listeners\Auth\Login',

From f05425b0915319b2eab908c05c38230868e12198 Mon Sep 17 00:00:00 2001
From: denisdulici <denisdulici@gmail.com>
Date: Tue, 10 Mar 2020 15:14:35 +0300
Subject: [PATCH 32/65] styling

---
 resources/views/partials/reports/table.blade.php             | 2 +-
 resources/views/reports/profit_loss/content/footer.blade.php | 2 +-
 resources/views/reports/profit_loss/content/header.blade.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/partials/reports/table.blade.php b/resources/views/partials/reports/table.blade.php
index 424e3907c..a3794a43a 100644
--- a/resources/views/partials/reports/table.blade.php
+++ b/resources/views/partials/reports/table.blade.php
@@ -1,4 +1,4 @@
-<div class="table-responsive overflow-auto">
+<div class="table-responsive">
     <table class="table table-hover align-items-center rp-border-collapse">
         @include($class->views['table.header'])
         <tbody>
diff --git a/resources/views/reports/profit_loss/content/footer.blade.php b/resources/views/reports/profit_loss/content/footer.blade.php
index 0344cba21..e2d7e44a3 100644
--- a/resources/views/reports/profit_loss/content/footer.blade.php
+++ b/resources/views/reports/profit_loss/content/footer.blade.php
@@ -1,4 +1,4 @@
-<div class="table-responsive overflow-auto my-2">
+<div class="table-responsive my-2">
     <table class="table table-hover align-items-center rp-border-collapse">
         <tfoot class="border-top-style">
             <tr class="row rp-border-top-1 font-size-unset px-3">
diff --git a/resources/views/reports/profit_loss/content/header.blade.php b/resources/views/reports/profit_loss/content/header.blade.php
index 77bb48802..9682fa509 100644
--- a/resources/views/reports/profit_loss/content/header.blade.php
+++ b/resources/views/reports/profit_loss/content/header.blade.php
@@ -1,4 +1,4 @@
-<div class="table-responsive overflow-auto mt-4">
+<div class="table-responsive mt-4">
     <table class="table table-hover align-items-center rp-border-collapse">
         <thead class="border-top-style">
             <tr class="row rp-border-bottom-1 font-size-unset px-3">

From 397b050eaeb67b6c8dd895e804240dd89efaff72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Tue, 10 Mar 2020 17:25:22 +0300
Subject: [PATCH 33/65] close #1340 Fixed: Missing edit invoice and bill item
 taxes.

---
 app/Models/Purchase/BillItem.php | 25 +++++++++++++++++++++++++
 app/Models/Sale/InvoiceItem.php  | 25 +++++++++++++++++++++++++
 2 files changed, 50 insertions(+)

diff --git a/app/Models/Purchase/BillItem.php b/app/Models/Purchase/BillItem.php
index 76ae399e0..774d2784b 100644
--- a/app/Models/Purchase/BillItem.php
+++ b/app/Models/Purchase/BillItem.php
@@ -27,6 +27,15 @@ class BillItem extends Model
      */
     public $cloneable_relations = ['taxes'];
 
+    public static function boot()
+    {
+        parent::boot();
+
+        static::retrieved(function($model) {
+            $model->setTaxIds();
+        });
+    }
+
     public function bill()
     {
         return $this->belongsTo('App\Models\Purchase\Bill');
@@ -74,4 +83,20 @@ class BillItem extends Model
     {
         $this->attributes['tax'] = (double) $value;
     }
+
+    /**
+     * Convert tax to Array.
+     *
+     * @return void
+     */
+    public function setTaxIds()
+    {
+        $tax_ids = [];
+
+        foreach ($this->taxes as $tax) {
+            $tax_ids[] = (string) $tax->tax_id;
+        }
+
+        $this->setAttribute('tax_id', $tax_ids);
+    }
 }
diff --git a/app/Models/Sale/InvoiceItem.php b/app/Models/Sale/InvoiceItem.php
index b9bd13a43..8fac300a2 100644
--- a/app/Models/Sale/InvoiceItem.php
+++ b/app/Models/Sale/InvoiceItem.php
@@ -26,6 +26,15 @@ class InvoiceItem extends Model
      */
     public $cloneable_relations = ['taxes'];
 
+    public static function boot()
+    {
+        parent::boot();
+
+        static::retrieved(function($model) {
+            $model->setTaxIds();
+        });
+    }
+
     public function invoice()
     {
         return $this->belongsTo('App\Models\Sale\Invoice');
@@ -73,4 +82,20 @@ class InvoiceItem extends Model
     {
         $this->attributes['tax'] = (double) $value;
     }
+
+    /**
+     * Convert tax to Array.
+     *
+     * @return void
+     */
+    public function setTaxIds()
+    {
+        $tax_ids = [];
+
+        foreach ($this->taxes as $tax) {
+            $tax_ids[] = (string) $tax->tax_id;
+        }
+
+        $this->setAttribute('tax_id', $tax_ids);
+    }
 }

From f75635c4ae3bad885b70a540dcd583d83d2c108a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Tue, 10 Mar 2020 17:30:47 +0300
Subject: [PATCH 34/65] old invoice and bill items get table..

---
 resources/views/purchases/bills/create.blade.php | 2 +-
 resources/views/purchases/bills/edit.blade.php   | 2 +-
 resources/views/sales/invoices/create.blade.php  | 2 +-
 resources/views/sales/invoices/edit.blade.php    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/resources/views/purchases/bills/create.blade.php b/resources/views/purchases/bills/create.blade.php
index 910fb1268..6b5b0ced6 100644
--- a/resources/views/purchases/bills/create.blade.php
+++ b/resources/views/purchases/bills/create.blade.php
@@ -198,7 +198,7 @@
 
 @push('scripts_start')
     <script type="text/javascript">
-        var bill_items = false;
+        var bill_items = {!! (old('items')) ? json_encode(old('items')) : 'false' !!};
     </script>
 
     <script src="{{ asset('public/js/purchases/bills.js?v=' . version('short')) }}"></script>
diff --git a/resources/views/purchases/bills/edit.blade.php b/resources/views/purchases/bills/edit.blade.php
index 415960492..4bd955b1b 100644
--- a/resources/views/purchases/bills/edit.blade.php
+++ b/resources/views/purchases/bills/edit.blade.php
@@ -201,7 +201,7 @@
 
 @push('scripts_start')
     <script type="text/javascript">
-        var bill_items = {!! json_encode($bill->items()->get()) !!};
+        var bill_items = {!! json_encode(old('items', $bill->items()->get())) !!};
     </script>
 
     <script src="{{ asset('public/js/purchases/bills.js?v=' . version('short')) }}"></script>
diff --git a/resources/views/sales/invoices/create.blade.php b/resources/views/sales/invoices/create.blade.php
index 0c0726986..d32cdf149 100644
--- a/resources/views/sales/invoices/create.blade.php
+++ b/resources/views/sales/invoices/create.blade.php
@@ -200,7 +200,7 @@
 
 @push('scripts_start')
     <script type="text/javascript">
-        var invoice_items = false;
+        var invoice_items = {!! (old('items')) ? json_encode(old('items')) : 'false' !!};
     </script>
 
     <script src="{{ asset('public/js/sales/invoices.js?v=' . version('short')) }}"></script>
diff --git a/resources/views/sales/invoices/edit.blade.php b/resources/views/sales/invoices/edit.blade.php
index 7e3a3c65e..72aec97ee 100644
--- a/resources/views/sales/invoices/edit.blade.php
+++ b/resources/views/sales/invoices/edit.blade.php
@@ -203,7 +203,7 @@
 
 @push('scripts_start')
     <script type="text/javascript">
-        var invoice_items = {!! json_encode($invoice->items()->get()) !!};
+        var invoice_items = {!! json_encode(old('items', $invoice->items()->get())) !!};
     </script>
 
     <script src="{{ asset('public/js/sales/invoices.js?v=' . version('short')) }}"></script>

From 38a97f9498d98934546bf8991a0bbac127a62413 Mon Sep 17 00:00:00 2001
From: denisdulici <denisdulici@gmail.com>
Date: Tue, 10 Mar 2020 17:42:13 +0300
Subject: [PATCH 35/65] styling reports

---
 .../views/partials/reports/table/footer.blade.php      |  2 +-
 .../views/partials/reports/table/header.blade.php      |  2 +-
 resources/views/partials/reports/table/rows.blade.php  |  2 +-
 .../views/reports/profit_loss/content/footer.blade.php |  4 +---
 .../views/reports/profit_loss/content/header.blade.php |  4 +---
 .../views/reports/profit_loss/table/footer.blade.php   |  2 +-
 .../views/reports/tax_summary/content/footer.blade.php |  1 -
 .../views/reports/tax_summary/content/header.blade.php | 10 +++++-----
 .../views/reports/tax_summary/table/footer.blade.php   |  8 ++++----
 9 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/resources/views/partials/reports/table/footer.blade.php b/resources/views/partials/reports/table/footer.blade.php
index 7464aa6b6..ba6e3260a 100644
--- a/resources/views/partials/reports/table/footer.blade.php
+++ b/resources/views/partials/reports/table/footer.blade.php
@@ -6,6 +6,6 @@
             @php $grand_total += $total; @endphp
             <th class="{{ $class->column_value_width }} text-right px-0">@money($total, setting('default.currency'), true)</th>
         @endforeach
-        <th class="{{ $class->column_name_width }} text-right">@money($grand_total, setting('default.currency'), true)</th>
+        <th class="{{ $class->column_name_width }} text-right pl-0 pr-4">@money($grand_total, setting('default.currency'), true)</th>
     </tr>
 </tfoot>
diff --git a/resources/views/partials/reports/table/header.blade.php b/resources/views/partials/reports/table/header.blade.php
index c4d0edd32..85da605e6 100644
--- a/resources/views/partials/reports/table/header.blade.php
+++ b/resources/views/partials/reports/table/header.blade.php
@@ -8,6 +8,6 @@
         @foreach($class->dates as $date)
             <th class="{{ $class->column_value_width }} text-right px-0">{{ $date }}</th>
         @endforeach
-        <th class="{{ $class->column_name_width }} text-right">{{ trans_choice('general.totals', 1) }}</th>
+        <th class="{{ $class->column_name_width }} text-right pl-0 pr-4">{{ trans_choice('general.totals', 1) }}</th>
     </tr>
 </thead>
diff --git a/resources/views/partials/reports/table/rows.blade.php b/resources/views/partials/reports/table/rows.blade.php
index 9ae064ea4..30fdbb3e4 100644
--- a/resources/views/partials/reports/table/rows.blade.php
+++ b/resources/views/partials/reports/table/rows.blade.php
@@ -5,5 +5,5 @@
         @php $row_total += $row; @endphp
         <td class="{{ $class->column_value_width }} text-right px-0">@money($row, setting('default.currency'), true)</td>
     @endforeach
-    <td class="{{ $class->column_name_width }} text-right">@money($row_total, setting('default.currency'), true)</td>
+    <td class="{{ $class->column_name_width }} text-right pl-0 pr-4">@money($row_total, setting('default.currency'), true)</td>
 </tr>
diff --git a/resources/views/reports/profit_loss/content/footer.blade.php b/resources/views/reports/profit_loss/content/footer.blade.php
index e2d7e44a3..286aeb58f 100644
--- a/resources/views/reports/profit_loss/content/footer.blade.php
+++ b/resources/views/reports/profit_loss/content/footer.blade.php
@@ -6,9 +6,7 @@
                 @foreach($class->net_profit as $profit)
                     <th class="{{ $class->column_value_width }} text-right px-0 border-top-0">@money($profit, setting('default.currency'), true)</th>
                 @endforeach
-                <th class="{{ $class->column_name_width }} text-right border-top-0">
-                    @money(array_sum($class->net_profit), setting('default.currency'), true)
-                </th>
+                <th class="{{ $class->column_name_width }} text-right pl-0 pr-4 border-top-0">@money(array_sum($class->net_profit), setting('default.currency'), true)</th>
             </tr>
         </tfoot>
     </table>
diff --git a/resources/views/reports/profit_loss/content/header.blade.php b/resources/views/reports/profit_loss/content/header.blade.php
index 9682fa509..8e3aa5fbd 100644
--- a/resources/views/reports/profit_loss/content/header.blade.php
+++ b/resources/views/reports/profit_loss/content/header.blade.php
@@ -6,9 +6,7 @@
                 @foreach($class->dates as $date)
                     <th class="{{ $class->column_value_width }} text-right px-0 border-top-0">{{ $date }}</th>
                 @endforeach
-                <th class="{{ $class->column_name_width }} text-uppercase text-right border-top-0">
-                    {{ trans_choice('general.totals', 1) }}
-                </th>
+                <th class="{{ $class->column_name_width }} text-uppercase text-right pl-0 pr-4 border-top-0">{{ trans_choice('general.totals', 1) }}</th>
             </tr>
         </thead>
     </table>
diff --git a/resources/views/reports/profit_loss/table/footer.blade.php b/resources/views/reports/profit_loss/table/footer.blade.php
index 469f393a5..5cae13c0c 100644
--- a/resources/views/reports/profit_loss/table/footer.blade.php
+++ b/resources/views/reports/profit_loss/table/footer.blade.php
@@ -6,6 +6,6 @@
             @php $grand_total += $total; @endphp
             <th class="{{ $class->column_value_width }} text-right px-0">@money($total, setting('default.currency'), true)</th>
         @endforeach
-        <th class="{{ $class->column_name_width }} text-right">@money($grand_total, setting('default.currency'), true)</th>
+        <th class="{{ $class->column_name_width }} text-right pl-0 pr-4">@money($grand_total, setting('default.currency'), true)</th>
     </tr>
 </tfoot>
diff --git a/resources/views/reports/tax_summary/content/footer.blade.php b/resources/views/reports/tax_summary/content/footer.blade.php
index e6b2eb47b..e69de29bb 100644
--- a/resources/views/reports/tax_summary/content/footer.blade.php
+++ b/resources/views/reports/tax_summary/content/footer.blade.php
@@ -1 +0,0 @@
-<div>&nbsp;</div>
diff --git a/resources/views/reports/tax_summary/content/header.blade.php b/resources/views/reports/tax_summary/content/header.blade.php
index 72e64f7e6..b658d1847 100644
--- a/resources/views/reports/tax_summary/content/header.blade.php
+++ b/resources/views/reports/tax_summary/content/header.blade.php
@@ -1,12 +1,12 @@
-<div class="table-responsive overflow-auto mt-4">
+<div class="table-responsive">
     <table class="table table-hover align-items-center rp-border-collapse">
         <thead class="border-top-style">
-            <tr>
-                <th class="report-column text-right rp-border-bottom-1"></th>
+            <tr class="row rp-border-bottom-1 font-size-unset px-3">
+                <th class="{{ $class->column_name_width }} text-right border-top-0 rp-border-bottom-1"></th>
                 @foreach($class->dates as $date)
-                    <th class="report-column text-right px-0 rp-border-bottom-1">{{ $date }}</th>
+                    <th class="{{ $class->column_value_width }} text-right px-0 border-top-0 rp-border-bottom-1">{{ $date }}</th>
                 @endforeach
-                <th class="report-column text-right rp-border-bottom-1">{{ trans_choice('general.totals', 1) }}</th>
+                <th class="{{ $class->column_name_width }} text-right pl-0 pr-4 border-top-0 rp-border-bottom-1">{{ trans_choice('general.totals', 1) }}</th>
             </tr>
         </thead>
     </table>
diff --git a/resources/views/reports/tax_summary/table/footer.blade.php b/resources/views/reports/tax_summary/table/footer.blade.php
index 9e280f413..17b2c7bd9 100644
--- a/resources/views/reports/tax_summary/table/footer.blade.php
+++ b/resources/views/reports/tax_summary/table/footer.blade.php
@@ -1,11 +1,11 @@
 <tfoot>
-    <tr class="rp-border-top-1">
-        <th class="report-column text-left">{{ trans('reports.net') }}</th>
+    <tr class="row rp-border-bottom-1 font-size-unset px-3">
+        <th class="{{ $class->column_name_width }} text-left">{{ trans('reports.net') }}</th>
         @php $grand_total = 0; @endphp
         @foreach($class->footer_totals[$table] as $total)
             @php $grand_total += $total; @endphp
-            <th class="report-column text-right px-0">@money($total, setting('default.currency'), true)</th>
+            <th class="{{ $class->column_value_width }} text-right px-0">@money($total, setting('default.currency'), true)</th>
         @endforeach
-        <th class="report-column text-right">@money($grand_total, setting('default.currency'), true)</th>
+        <th class="{{ $class->column_name_width }} text-right pl-0 pr-4">@money($grand_total, setting('default.currency'), true)</th>
     </tr>
 </tfoot>

From 64cd21d5eaf99c5afe9cea31423ebb8f2f4d958c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Tue, 10 Mar 2020 17:43:19 +0300
Subject: [PATCH 36/65] close #1341 Changed: Remove code and image buttons from
 settings editor

---
 .../js/components/AkauntingHtmlEditor.vue     | 94 +++++++++++++++++++
 resources/assets/js/mixins/global.js          |  5 +-
 .../assets/js/views/settings/settings.js      | 14 +--
 .../partials/form/text_editor_group.blade.php |  4 +-
 4 files changed, 104 insertions(+), 13 deletions(-)
 create mode 100644 resources/assets/js/components/AkauntingHtmlEditor.vue

diff --git a/resources/assets/js/components/AkauntingHtmlEditor.vue b/resources/assets/js/components/AkauntingHtmlEditor.vue
new file mode 100644
index 000000000..22be7451b
--- /dev/null
+++ b/resources/assets/js/components/AkauntingHtmlEditor.vue
@@ -0,0 +1,94 @@
+<template>
+    <div class="quill">
+        <div :id="toolbarId">
+            <div class="ql-formats">
+                <button class="ql-bold"></button>
+                <button class="ql-italic"></button>
+                <button class="ql-underline"></button>
+                <button class="ql-link"></button>
+                <button class="ql-blockquote"></button>
+                <button type="button" class="ql-list" value="ordered"></button>
+                <button type="button" class="ql-list" value="bullet"></button>
+            </div>
+        </div>
+        <div :id="editorId" :name="name" class="" ref="editor">
+        </div>
+    </div>
+</template>
+<script>
+  export default {
+    name: 'akaunting-html-editor',
+    props: {
+      value: {
+        type: String,
+        default: ''
+      },
+      name: String
+    },
+    data () {
+      return {
+        editor: null,
+        content: null,
+        lastHtmlValue: '',
+        editorId: null,
+        toolbarId: null
+      }
+    },
+    methods: {
+      initialize (Quill) {
+        this.editor = new Quill(`#${this.editorId}`, {
+          theme: 'snow',
+          modules: {
+            toolbar: `#${this.toolbarId}`
+          }
+        })
+
+        if (this.value.length > 0) {
+          this.editor.pasteHTML(this.value)
+        }
+
+        let editorRef = this.$refs.editor;
+        let node = editorRef.children[0];
+        this.editor.on('text-change', () => {
+          let html = node.innerHTML
+          if (html === '<p><br></p>') {
+            html = '';
+          }
+          this.content = html
+          this.$emit('input', this.content);
+        })
+      },
+      pasteHTML () {
+        if (!this.editor) {
+          return
+        }
+        this.editor.pasteHTML(this.value)
+      },
+      randomString() {
+        let text = "";
+        let possible = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+
+        for (let i = 0; i < 5; i++)
+          text += possible.charAt(Math.floor(Math.random() * possible.length));
+
+        return text;
+      }
+    },
+    async mounted () {
+      let Quill = await import('quill')
+      Quill = Quill.default || Quill
+      this.editorId = this.randomString();
+      this.toolbarId = this.randomString();
+      this.$nextTick(() => {
+        this.initialize(Quill)
+      });
+    },
+    watch: {
+      value (newVal) {
+        if (newVal !== this.content) {
+          this.pasteHTML(newVal);
+        }
+      }
+    }
+  }
+</script>
diff --git a/resources/assets/js/mixins/global.js b/resources/assets/js/mixins/global.js
index f765248d7..46bdabf21 100644
--- a/resources/assets/js/mixins/global.js
+++ b/resources/assets/js/mixins/global.js
@@ -11,12 +11,13 @@ import AkauntingSelect from './../components/AkauntingSelect';
 import AkauntingSelectRemote from './../components/AkauntingSelectRemote';
 import AkauntingDate from './../components/AkauntingDate';
 import AkauntingRecurring from './../components/AkauntingRecurring';
+import AkauntingHtmlEditor from './../components/AkauntingHtmlEditor';
 
 import NProgress from 'nprogress';
 import 'nprogress/nprogress.css';
 import NProgressAxios from './../plugins/nprogress-axios';
 
-import { Select, Option, Steps, Step, Button, Link, Tooltip } from 'element-ui';
+import { Select, Option, Steps, Step, Button, Link, Tooltip, ColorPicker } from 'element-ui';
 
 import Form from './../plugins/form';
 
@@ -31,6 +32,7 @@ export default {
         AkauntingModalAddNew,
         AkauntingDate,
         AkauntingRecurring,
+        AkauntingHtmlEditor,
         [Select.name]: Select,
         [Option.name]: Option,
         [Steps.name]: Steps,
@@ -38,6 +40,7 @@ export default {
         [Button.name]: Button,
         [Link.name]: Link,
         [Tooltip.name]: Tooltip,
+        [ColorPicker.name]: ColorPicker,
     },
 
     data: function () {
diff --git a/resources/assets/js/views/settings/settings.js b/resources/assets/js/views/settings/settings.js
index ee28fd6ba..40c7f9be6 100644
--- a/resources/assets/js/views/settings/settings.js
+++ b/resources/assets/js/views/settings/settings.js
@@ -14,11 +14,9 @@ import Global from './../../mixins/global';
 
 import Form from './../../plugins/form';
 import BulkAction from './../../plugins/bulk-action';
-import HtmlEditor from './../../components/Inputs/HtmlEditor';
-import {ColorPicker} from 'element-ui';
 
 // plugin setup
-Vue.use(DashboardPlugin, ColorPicker);
+Vue.use(DashboardPlugin);
 
 const app = new Vue({
     el: '#app',
@@ -27,13 +25,9 @@ const app = new Vue({
         Global
     ],
 
-    components: {
-        HtmlEditor,
-        [ColorPicker.name]: ColorPicker,
-    },
-
     mounted() {
         this.onChangeProtocol(this.form.protocol);
+
         this.color = this.form.color;
     },
 
@@ -41,7 +35,7 @@ const app = new Vue({
         return {
             form: new Form('setting'),
             bulk_action: new BulkAction('settings'),
-            email:{
+            email: {
                 sendmailPath:true,
                 smtpHost:true,
                 smtpPort:true,
@@ -60,7 +54,7 @@ const app = new Vue({
             },
 
             color: '#55588b',
-            predefineColors:[
+            predefineColors: [
                 '#3c3f72',
                 '#55588b',
                 '#e5e5e5',
diff --git a/resources/views/partials/form/text_editor_group.blade.php b/resources/views/partials/form/text_editor_group.blade.php
index ade409483..74ff56c1c 100644
--- a/resources/views/partials/form/text_editor_group.blade.php
+++ b/resources/views/partials/form/text_editor_group.blade.php
@@ -7,7 +7,7 @@
             {!! Form::label($name, $text, ['class' => 'form-control-label'])!!}
         @endif
 
-        <html-editor
+        <akaunting-html-editor
             name="{{ $name }}"
 
             @if (!empty($attributes['v-model']))
@@ -29,7 +29,7 @@
             @if (isset($attributes['disabled']))
             :disabled="'{{ $attributes['disabled'] }}'"
             @endif
-        ></html-editor>
+        ></akaunting-html-editor>
 
         <div class="invalid-feedback d-block"
             v-if="{{ isset($attributes['v-error']) ? $attributes['v-error'] : 'form.errors.has("' . $name . '")' }}"

From cdf5312023df73d7615a284c3c58694cec1518b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cihan=20=C5=9Eent=C3=BCrk?= <cihan@akaunting.com>
Date: Tue, 10 Mar 2020 19:01:38 +0300
Subject: [PATCH 37/65] Modal vendor create currency issue solved.

---
 resources/views/modals/vendors/create.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/modals/vendors/create.blade.php b/resources/views/modals/vendors/create.blade.php
index b08f0ccd2..a2a6f81a2 100644
--- a/resources/views/modals/vendors/create.blade.php
+++ b/resources/views/modals/vendors/create.blade.php
@@ -14,7 +14,7 @@
 
         {{ Form::textGroup('tax_number', trans('general.tax_number'), 'percent', []) }}
 
-        {{ Form::selectGroup('currency_code', trans_choice('general.currencies', 1), 'exchange-alt', $currencies, setting('default.currency'), ['required' => 'required', 'model' => setting('default.currency')]) }}
+        {{ Form::selectGroup('currency_code', trans_choice('general.currencies', 1), 'exchange-alt', $currencies, setting('default.currency')) }}
 
         {{ Form::textareaGroup('address', trans('general.address')) }}
 

From adbc26a6bd98e509ff2f9ae50ce338d44decad72 Mon Sep 17 00:00:00 2001
From: denisdulici <denisdulici@gmail.com>
Date: Tue, 10 Mar 2020 19:09:13 +0300
Subject: [PATCH 38/65] added progress bar

---
 database/seeds/SampleData.php | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/database/seeds/SampleData.php b/database/seeds/SampleData.php
index 21af5cac1..7c15f855d 100755
--- a/database/seeds/SampleData.php
+++ b/database/seeds/SampleData.php
@@ -27,12 +27,35 @@ class SampleData extends Seeder
         $count = (int) $this->command->option('count');
         $acc_count = ($count <= 10) ? $count : 10;
 
+        $this->command->info('Creating sample data...');
+
+        $bar = $this->command->getOutput()->createProgressBar(6);
+        $bar->setFormat('verbose');
+
+        $bar->start();
+
         factory(Contact::class, $count)->create();
+        $bar->advance();
+
         factory(Category::class, $count)->create();
+        $bar->advance();
+
         factory(Item::class, $count)->create();
+        $bar->advance();
+
         factory(Account::class, $acc_count)->create();
+        $bar->advance();
+
         factory(Bill::class, $count)->create();
+        $bar->advance();
+
         factory(Invoice::class, $count)->create();
+        $bar->advance();
+
+        $bar->finish();
+
+        $this->command->info('');
+        $this->command->info('Sample data created.');
 
         Model::unguard();
     }

From 48f3b7c3b65b9dc776430d98d01defd4d6175b77 Mon Sep 17 00:00:00 2001
From: denisdulici <denisdulici@gmail.com>
Date: Wed, 11 Mar 2020 14:15:24 +0300
Subject: [PATCH 39/65] added mute/unmute

---
 app/Abstracts/Observer.php       | 10 ++++++++++
 app/Jobs/Purchase/DeleteBill.php |  5 +++--
 app/Jobs/Sale/DeleteInvoice.php  |  5 +++--
 app/Observers/Transaction.php    | 11 ++---------
 4 files changed, 18 insertions(+), 13 deletions(-)
 create mode 100644 app/Abstracts/Observer.php

diff --git a/app/Abstracts/Observer.php b/app/Abstracts/Observer.php
new file mode 100644
index 000000000..a6edc2c59
--- /dev/null
+++ b/app/Abstracts/Observer.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Abstracts;
+
+use Monooso\Unobserve\CanMute;
+
+abstract class Observer
+{
+    use CanMute;
+}
diff --git a/app/Jobs/Purchase/DeleteBill.php b/app/Jobs/Purchase/DeleteBill.php
index 918fd1186..f90048303 100644
--- a/app/Jobs/Purchase/DeleteBill.php
+++ b/app/Jobs/Purchase/DeleteBill.php
@@ -4,6 +4,7 @@ namespace App\Jobs\Purchase;
 
 use App\Abstracts\Job;
 use App\Models\Purchase\Bill;
+use App\Observers\Transaction;
 
 class DeleteBill extends Job
 {
@@ -26,7 +27,7 @@ class DeleteBill extends Job
      */
     public function handle()
     {
-        session(['deleting_bill' => true]);
+        Transaction::mute();
 
         $this->deleteRelationships($this->bill, [
             'items', 'item_taxes', 'histories', 'transactions', 'recurring', 'totals'
@@ -34,7 +35,7 @@ class DeleteBill extends Job
 
         $this->bill->delete();
 
-        session()->forget('deleting_bill');
+        Transaction::unmute();
 
         return true;
     }
diff --git a/app/Jobs/Sale/DeleteInvoice.php b/app/Jobs/Sale/DeleteInvoice.php
index a2beaef8c..decf06677 100644
--- a/app/Jobs/Sale/DeleteInvoice.php
+++ b/app/Jobs/Sale/DeleteInvoice.php
@@ -4,6 +4,7 @@ namespace App\Jobs\Sale;
 
 use App\Abstracts\Job;
 use App\Models\Sale\Invoice;
+use App\Observers\Transaction;
 
 class DeleteInvoice extends Job
 {
@@ -26,7 +27,7 @@ class DeleteInvoice extends Job
      */
     public function handle()
     {
-        session(['deleting_invoice' => true]);
+        Transaction::mute();
 
         $this->deleteRelationships($this->invoice, [
             'items', 'item_taxes', 'histories', 'transactions', 'recurring', 'totals'
@@ -34,7 +35,7 @@ class DeleteInvoice extends Job
 
         $this->invoice->delete();
 
-        session()->forget('deleting_invoice');
+        Transaction::unmute();
 
         return true;
     }
diff --git a/app/Observers/Transaction.php b/app/Observers/Transaction.php
index c3985d652..fa7247e12 100644
--- a/app/Observers/Transaction.php
+++ b/app/Observers/Transaction.php
@@ -2,12 +2,13 @@
 
 namespace App\Observers;
 
+use App\Abstracts\Observer;
 use App\Jobs\Purchase\CreateBillHistory;
 use App\Jobs\Sale\CreateInvoiceHistory;
 use App\Models\Banking\Transaction as Model;
 use App\Traits\Jobs;
 
-class Transaction
+class Transaction extends Observer
 {
     use Jobs;
 
@@ -30,10 +31,6 @@ class Transaction
 
     protected function updateInvoice($transaction)
     {
-        if (session('deleting_invoice')) {
-            return;
-        }
-
         $invoice = $transaction->invoice;
 
         $invoice->status = ($invoice->transactions->count() > 1) ? 'partial' : 'sent';
@@ -45,10 +42,6 @@ class Transaction
 
     protected function updateBill($transaction)
     {
-        if (session('deleting_bill')) {
-            return;
-        }
-
         $bill = $transaction->bill;
 
         $bill->status = ($bill->transactions->count() > 1) ? 'partial' : 'received';

From 2f49904b182eadc9141d457e15895b56313433b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Wed, 11 Mar 2020 15:59:24 +0300
Subject: [PATCH 40/65] Invoice & bill item new style..

---
 .../js/components/AkauntingSelectRemote.vue   | 264 +++++++++---------
 resources/assets/js/views/purchases/bills.js  |   4 +-
 resources/assets/js/views/sales/invoices.js   |   4 +-
 .../views/purchases/bills/item.blade.php      |   6 +-
 resources/views/sales/invoices/item.blade.php |   5 +-
 5 files changed, 151 insertions(+), 132 deletions(-)

diff --git a/resources/assets/js/components/AkauntingSelectRemote.vue b/resources/assets/js/components/AkauntingSelectRemote.vue
index 61b21d504..621c09c1d 100644
--- a/resources/assets/js/components/AkauntingSelectRemote.vue
+++ b/resources/assets/js/components/AkauntingSelectRemote.vue
@@ -312,94 +312,96 @@
         <span slot="infoBlock" class="badge badge-success badge-resize float-right" v-if="new_options[real_model]">{{ new_text }}</span>
     </base-input>
 
-    <el-select v-else
-        :class="'pl-20 mr-40'"
-        v-model="real_model"
-        @input="change"
-        filterable
-        remote
-        reserve-keyword
-        :placeholder="placeholder"
-        :remote-method="remoteMethod"
-        :loading="loading">
-            <div v-if="loading" class="el-select-dropdown__wrap" slot="empty">
-                <p class="el-select-dropdown__empty loading">
-                    {{ loadingText }}
-                </p>
-            </div>
-
-            <div v-else-if="addNew.status && options.length != 0" class="el-select-dropdown__wrap" slot="empty">
-                <p class="el-select-dropdown__empty">
-                    {{ noMatchingDataText }}
-                </p>
-                <ul class="el-scrollbar__view el-select-dropdown__list">
-                    <li class="el-select-dropdown__item el-select__footer">
-                        <div @click="onAddItem">
-                            <i class="fas fa-plus"></i>
-                            <span>
-                                {{ add_new_text }}
-                            </span>
-                        </div>
-                    </li>
-                </ul>
-            </div>
-
-            <div v-else-if="addNew.status && options.length == 0" slot="empty">
-                <p class="el-select-dropdown__empty">
-                    {{ noDataText }}
-                </p>
-                <ul class="el-scrollbar__view el-select-dropdown__list">
-                    <li class="el-select-dropdown__item el-select__footer">
-                        <div @click="onAddItem">
-                            <i class="fas fa-plus"></i>
-                            <span>
-                                {{ add_new_text }}
-                            </span>
-                        </div>
-                    </li>
-                </ul>
-            </div>
-
-            <template slot="prefix">
-                <span class="el-input__suffix-inner el-select-icon">
-                    <i :class="'select-icon-position el-input__icon fa fa-' + icon"></i>
-                </span>
-            </template>
-
-            <el-option v-if="!group" v-for="option in selectOptions"
-               :key="option.id"
-               :label="option.name"
-               :value="option.id">
-                <span class="float-left">{{ option.name }}</span>
-                <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[option.id]">{{ new_text }}</span>
-            </el-option>
-
-            <el-option-group
-                v-if="group"
-                v-for="(options, name) in selectOptions"
-                :key="name"
-                :label="name">
-                <el-option
-                    v-for="(label, value) in options"
-                    :key="value"
-                    :label="label"
-                    :value="value">
-                    <span class="float-left">{{ label }}</span>
-                    <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
-                </el-option>
-            </el-option-group>
-
-            <el-option v-if="!loading && addNew.status && selectOptions != null && selectOptions.length != 0" class="el-select__footer" :value="add_new">
-                <div @click="onAddItem">
-                    <i class="fas fa-plus"></i>
-                    <span>
-                        {{ add_new_text }}
-                    </span>
+    <span v-else>
+        <el-select
+            :class="'pl-20 mr-40'"
+            v-model="real_model"
+            @input="change"
+            filterable
+            remote
+            reserve-keyword
+            :placeholder="placeholder"
+            :remote-method="remoteMethod"
+            :loading="loading">
+                <div v-if="loading" class="el-select-dropdown__wrap" slot="empty">
+                    <p class="el-select-dropdown__empty loading">
+                        {{ loadingText }}
+                    </p>
                 </div>
-            </el-option>
 
-        <span slot="infoBlock" class="badge badge-success badge-resize float-right" v-if="new_options[real_model]">{{ new_text }}</span>
-    </el-select>
+                <div v-else-if="addNew.status && options.length != 0" class="el-select-dropdown__wrap" slot="empty">
+                    <p class="el-select-dropdown__empty">
+                        {{ noMatchingDataText }}
+                    </p>
+                    <ul class="el-scrollbar__view el-select-dropdown__list">
+                        <li class="el-select-dropdown__item el-select__footer">
+                            <div @click="onAddItem">
+                                <i class="fas fa-plus"></i>
+                                <span>
+                                    {{ add_new_text }}
+                                </span>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
+
+                <div v-else-if="addNew.status && options.length == 0" slot="empty">
+                    <p class="el-select-dropdown__empty">
+                        {{ noDataText }}
+                    </p>
+                    <ul class="el-scrollbar__view el-select-dropdown__list">
+                        <li class="el-select-dropdown__item el-select__footer">
+                            <div @click="onAddItem">
+                                <i class="fas fa-plus"></i>
+                                <span>
+                                    {{ add_new_text }}
+                                </span>
+                            </div>
+                        </li>
+                    </ul>
+                </div>
+
+                <template slot="prefix">
+                    <span class="el-input__suffix-inner el-select-icon">
+                        <i :class="'select-icon-position el-input__icon fa fa-' + icon"></i>
+                    </span>
+                </template>
+
+                <el-option v-if="!group" v-for="option in selectOptions"
+                :key="option.id"
+                :label="option.name"
+                :value="option.id">
+                    <span class="float-left">{{ option.name }}</span>
+                    <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[option.id]">{{ new_text }}</span>
+                </el-option>
+
+                <el-option-group
+                    v-if="group"
+                    v-for="(options, name) in selectOptions"
+                    :key="name"
+                    :label="name">
+                    <el-option
+                        v-for="(label, value) in options"
+                        :key="value"
+                        :label="label"
+                        :value="value">
+                        <span class="float-left">{{ label }}</span>
+                        <span class="badge badge-pill badge-success float-right mt-2" v-if="new_options[value]">{{ new_text }}</span>
+                    </el-option>
+                </el-option-group>
+
+                <el-option v-if="!loading && addNew.status && selectOptions != null && selectOptions.length != 0" class="el-select__footer" :value="add_new">
+                    <div @click="onAddItem">
+                        <i class="fas fa-plus"></i>
+                        <span>
+                            {{ add_new_text }}
+                        </span>
+                    </div>
+                </el-option>
+        </el-select>
+
+        <span class="badge badge-success badge-resize float-right mr-2" v-if="new_options[real_model]">{{ new_text }}</span>
+    </span>
 </template>
 
 <script>
@@ -561,7 +563,7 @@ export default {
                 show: false,
                 path: this.addNew.path,
                 type: this.addNew.type, // modal, inline
-                field: this.addNew.name,
+                field: this.addNew.field,
                 buttons: this.addNew.buttons
             },
             add_new_text: this.addNew.text,
@@ -590,36 +592,32 @@ export default {
             if (query !== '') {
                 this.loading = true;
 
-                /*
-                this.list = [];
-                this.selectOptions = this.options;
-
-                Object.keys(this.selectOptions).forEach(key => {
-                    const item = this.selectOptions[key];
-
-                    if (item.toLowerCase().indexOf(query.toLowerCase()) > -1) {
-                        this.list.push(this.selectOptions[key]);
-                    }
-                });
-
-                this.selectOptions = this.list;
-                */
-
                if (!this.remoteAction) {
                    this.remoteAction = url + '/common/items/autocomplete';
                }
 
-                axios.get(this.remoteAction, {
+                window.axios({
+                    method: 'GET',
+                    url: this.remoteAction,
                     params: {
                         type: this.remoteType,
                         query: query,
                         currency_code: this.currencyCode,
+                    },
+                    headers: {
+                        'X-CSRF-TOKEN': window.Laravel.csrfToken,
+                        'X-Requested-With': 'XMLHttpRequest',
+                        'Content-Type': 'multipart/form-data'
                     }
                 })
                 .then(response => {
                     this.loading = false;
 
-                    this.selectOptions = response.data.data;
+                    if (response.data.data) {
+                        this.selectOptions = response.data.data;
+                    } else {
+                        this.selectOptions = [];
+                    }
                 })
                 .catch(e => {
                 })
@@ -632,6 +630,10 @@ export default {
         },
 
         change() {
+            if (typeof(this.real_model) === 'object') {
+                return false;
+            }
+
             this.$emit('change', this.real_model);
             this.$emit('interface', this.real_model);
 
@@ -640,12 +642,20 @@ export default {
                     this.$emit('label', item.name);
                     this.$emit('option', item);
 
-                    return;
+                    return true;
                 }
             });
         },
 
-        onAddItem() {
+        onPressEnter() {
+            alert('Press Enter');
+        },
+
+        OnPressTab() {
+            alert('Press Tab');
+        },
+
+        async onAddItem() {
             // Get Select Input value
             if (this.title) {
                 var value = this.$children[0].$children[0].$children[0].$refs.input.value;
@@ -653,10 +663,14 @@ export default {
                 var value = this.$children[0].$children[0].$refs.input.value;
             }
 
+            if (value === '') {
+                return false;
+            }
+
             if (this.add_new.type == 'inline') {
-                this.addInline(value);
+                await this.addInline(value);
             } else {
-                this.onModal(value);
+                await this.onModal(value);
             }
         },
 
@@ -664,21 +678,15 @@ export default {
             window.axios.post(this.add_new.path, {
                 '_token': window.Laravel.csrfToken,
                 'type': 'inline',
-                field: this.add_new.field,
+                field: this.add_new.field.value,
                 value: value,
             })
             .then(response => {
                 if (response.data.success) {
-                    this.selectOptions[response.data.data.id] = response.data.data['name'];
-                    this.new_options[response.data.data.id] = response.data.data['name'];
-                    this.real_model = response.data.data.id;
-                    /*
-                    this.selectOptions = [];
-
                     this.selectOptions.push(response.data.data);
-                    this.new_options[response.data.data.id] = response.data.data.id;
-                    this.real_model = response.data.data.id;
-                    */
+                    this.new_options[response.data.data[this.add_new.field.key]] = response.data.data;
+                    this.real_model = response.data.data[this.add_new.field.key];
+
                     this.change();
 
                     if (this.title) {
@@ -686,10 +694,10 @@ export default {
                     } else {
                         this.$children[0].visible = false;
                     }
-                    //this.add_new.status = false;
                 }
             })
             .catch(error => {
+                console.log(error);
             });
         },
 
@@ -790,13 +798,15 @@ export default {
                 this.form.loading = false;
 
                 if (response.data.success) {
-                    this.selectOptions[response.data.data.id] = response.data.data['name'];
-                    this.new_options[response.data.data.id] = response.data.data['name'];
-                    this.real_model = response.data.data.id;
+                    
+                    this.selectOptions.push(response.data.data);
+                    //this.selectOptions[response.data.data[this.add_new.field.key]] = response.data.data[this.add_new.field.value];
+                    this.new_options[response.data.data[this.add_new.field.key]] = response.data.data[this.add_new.field.value];
+                    this.real_model = response.data.data[this.add_new.field.key];//.toString();
 
                     this.change();
 
-                    //this.add_new.show = false;
+                    this.add_new.show = false;
 
                     this.add_new.html = '';
                     this.add_new_html = null;
@@ -828,11 +838,9 @@ export default {
             this.selectOptions = options;
 
             if (Object.keys(this.new_options).length) {
-                for (let [key, value] of Object.entries(this.new_options)) {
-                    if (!this.selectOptions[key]) {
-                        this.selectOptions[key] = value;
-                    }
-                }
+                Object.values(this.new_options).forEach(item => {
+                    this.selectOptions.push(item);
+                });
             }
         },
 
diff --git a/resources/assets/js/views/purchases/bills.js b/resources/assets/js/views/purchases/bills.js
index 5563302f8..1fdb8dace 100644
--- a/resources/assets/js/views/purchases/bills.js
+++ b/resources/assets/js/views/purchases/bills.js
@@ -255,11 +255,13 @@ const app = new Vue({
         },
 
         onSelectItem(item, index) {
+            let tax_id = (item.tax_id) ? [item.tax_id.toString()] : '';
+
             this.form.items[index].item_id = item.id;
             this.form.items[index].name = item.name;
             this.form.items[index].price = (item.purchase_price).toFixed(2);
             this.form.items[index].quantity = 1;
-            this.form.items[index].tax_id = [item.tax_id.toString()];
+            this.form.items[index].tax_id = tax_id;
             this.form.items[index].total = (item.purchase_price).toFixed(2);
         },
 
diff --git a/resources/assets/js/views/sales/invoices.js b/resources/assets/js/views/sales/invoices.js
index 503e3ae05..25668bf86 100644
--- a/resources/assets/js/views/sales/invoices.js
+++ b/resources/assets/js/views/sales/invoices.js
@@ -255,11 +255,13 @@ const app = new Vue({
         },
 
         onSelectItem(item, index) {
+            let tax_id = (item.tax_id) ? [item.tax_id.toString()] : '';
+
             this.form.items[index].item_id = item.id;
             this.form.items[index].name = item.name;
             this.form.items[index].price = (item.sale_price).toFixed(2);
             this.form.items[index].quantity = 1;
-            this.form.items[index].tax_id = [item.tax_id.toString()];
+            this.form.items[index].tax_id = tax_id;
             this.form.items[index].total = (item.sale_price).toFixed(2);
         },
 
diff --git a/resources/views/purchases/bills/item.blade.php b/resources/views/purchases/bills/item.blade.php
index d4121678b..aca9092ee 100644
--- a/resources/views/purchases/bills/item.blade.php
+++ b/resources/views/purchases/bills/item.blade.php
@@ -29,7 +29,11 @@
                     'text' => trans('general.add_new'),
                     'path' => route('modals.items.store'),
                     'type' => 'inline',
-                    'field' => 'name',
+                    'field' => [
+                        'key' => 'id',
+                        'value' => 'name'
+                    ],
+                    'new_text' => trans('modules.new'),
                 ])}}"
                 @interface="row.item_id = $event"
                 @label="row.name = $event"
diff --git a/resources/views/sales/invoices/item.blade.php b/resources/views/sales/invoices/item.blade.php
index a282d879d..103e73fa8 100644
--- a/resources/views/sales/invoices/item.blade.php
+++ b/resources/views/sales/invoices/item.blade.php
@@ -29,7 +29,10 @@
                     'text' => trans('general.add_new'),
                     'path' => route('modals.items.store'),
                     'type' => 'inline',
-                    'field' => 'name',
+                    'field' => [
+                        'key' => 'id',
+                        'value' => 'name'
+                    ],
                     'new_text' => trans('modules.new'),
                 ])}}"
                 @interface="row.item_id = $event"

From ac29fe4bf1332938182059311e9dff65eccc3fbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Wed, 11 Mar 2020 16:37:42 +0300
Subject: [PATCH 41/65] Invoice and Bill create, edit page item table cells
 style fixes.

---
 resources/assets/js/views/purchases/bills.js     |  2 ++
 resources/assets/js/views/sales/invoices.js      |  2 ++
 resources/views/purchases/bills/create.blade.php | 10 +++++-----
 resources/views/purchases/bills/edit.blade.php   | 10 +++++-----
 resources/views/sales/invoices/create.blade.php  | 10 +++++-----
 resources/views/sales/invoices/edit.blade.php    | 10 +++++-----
 6 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/resources/assets/js/views/purchases/bills.js b/resources/assets/js/views/purchases/bills.js
index 1fdb8dace..9397710ab 100644
--- a/resources/assets/js/views/purchases/bills.js
+++ b/resources/assets/js/views/purchases/bills.js
@@ -50,10 +50,12 @@ const app = new Vue({
             items: '',
             discount: false,
             taxes: null,
+            colspan: 5,
         }
     },
 
     mounted() {
+        this.colspan = document.getElementById("items").rows[0].cells.length - 1;
         this.form.items = [];
 
         if (this.form.method) {
diff --git a/resources/assets/js/views/sales/invoices.js b/resources/assets/js/views/sales/invoices.js
index 25668bf86..c5e485fbb 100644
--- a/resources/assets/js/views/sales/invoices.js
+++ b/resources/assets/js/views/sales/invoices.js
@@ -50,10 +50,12 @@ const app = new Vue({
             items: '',
             discount: false,
             taxes: null,
+            colspan: 5,
         }
     },
 
     mounted() {
+        this.colspan = document.getElementById("items").rows[0].cells.length - 1;
         this.form.items = [];
 
         if (this.form.method) {
diff --git a/resources/views/purchases/bills/create.blade.php b/resources/views/purchases/bills/create.blade.php
index 6b5b0ced6..6c69677d1 100644
--- a/resources/views/purchases/bills/create.blade.php
+++ b/resources/views/purchases/bills/create.blade.php
@@ -69,13 +69,13 @@
                                                 <button type="button" @click="onAddItem" id="button-add-item" data-toggle="tooltip" title="{{ trans('general.add') }}" class="btn btn-icon btn-outline-success btn-lg" data-original-title="{{ trans('general.add') }}"><i class="fa fa-plus"></i>
                                                 </button>
                                             </td>
-                                            <td class="text-right border-bottom-0" colspan="5"></td>
+                                            <td class="text-right border-bottom-0" colspan="5" :colspan="colspan"></td>
                                         </tr>
                                     @stack('add_item_td_end')
 
                                     @stack('sub_total_td_start')
                                         <tr id="tr-subtotal">
-                                            <td class="text-right border-right-0 border-bottom-0" colspan="5">
+                                            <td class="text-right border-right-0 border-bottom-0" colspan="5" :colspan="colspan">
                                                 <strong>{{ trans('bills.sub_total') }}</strong>
                                             </td>
                                             <td class="text-right border-bottom-0 long-texts">
@@ -88,7 +88,7 @@
 
                                     @stack('add_discount_td_start')
                                         <tr id="tr-discount">
-                                            <td class="text-right border-right-0 border-bottom-0" colspan="5">
+                                            <td class="text-right border-right-0 border-bottom-0" colspan="5" :colspan="colspan">
                                                 <el-popover
                                                     popper-class="p-0 h-0"
                                                     placement="bottom"
@@ -140,7 +140,7 @@
 
                                     @stack('tax_total_td_start')
                                         <tr id="tr-tax">
-                                            <td class="text-right border-right-0 border-bottom-0" colspan="5">
+                                            <td class="text-right border-right-0 border-bottom-0" colspan="5" :colspan="colspan">
                                                 <strong>{{ trans_choice('general.taxes', 1) }}</strong>
                                             </td>
                                             <td class="text-right border-bottom-0 long-texts">
@@ -153,7 +153,7 @@
 
                                     @stack('grand_total_td_start')
                                         <tr id="tr-total">
-                                            <td class="text-right border-right-0" colspan="5">
+                                            <td class="text-right border-right-0" colspan="5" :colspan="colspan">
                                                 <strong>{{ trans('bills.total') }}</strong>
                                             </td>
                                             <td class="text-right long-texts">
diff --git a/resources/views/purchases/bills/edit.blade.php b/resources/views/purchases/bills/edit.blade.php
index 4bd955b1b..53eb712a7 100644
--- a/resources/views/purchases/bills/edit.blade.php
+++ b/resources/views/purchases/bills/edit.blade.php
@@ -70,13 +70,13 @@
                                                 <button type="button" @click="onAddItem" id="button-add-item" data-toggle="tooltip" title="{{ trans('general.add') }}" class="btn btn-icon btn-outline-success btn-lg" data-original-title="{{ trans('general.add') }}"><i class="fa fa-plus"></i>
                                                 </button>
                                             </td>
-                                            <td class="text-right border-bottom-0" colspan="5"></td>
+                                            <td class="text-right border-bottom-0" colspan="5" :colspan="colspan"></td>
                                         </tr>
                                     @stack('add_item_td_end')
 
                                     @stack('sub_total_td_start')
                                         <tr id="tr-subtotal">
-                                            <td class="text-right border-right-0 border-bottom-0" colspan="5">
+                                            <td class="text-right border-right-0 border-bottom-0" colspan="5" :colspan="colspan">
                                                 <strong>{{ trans('bills.sub_total') }}</strong>
                                             </td>
                                             <td class="text-right border-bottom-0 long-texts">
@@ -89,7 +89,7 @@
 
                                     @stack('add_discount_td_start')
                                         <tr id="tr-discount">
-                                            <td class="text-right border-right-0 border-bottom-0" colspan="5">
+                                            <td class="text-right border-right-0 border-bottom-0" colspan="5" :colspan="colspan">
                                                 <el-popover
                                                     popper-class="p-0 h-0"
                                                     placement="bottom"
@@ -141,7 +141,7 @@
 
                                     @stack('tax_total_td_start')
                                         <tr id="tr-tax">
-                                            <td class="text-right border-right-0 border-bottom-0" colspan="5">
+                                            <td class="text-right border-right-0 border-bottom-0" colspan="5" :colspan="colspan">
                                                 <strong>{{ trans_choice('general.taxes', 1) }}</strong>
                                             </td>
                                             <td class="text-right border-bottom-0 long-texts">
@@ -154,7 +154,7 @@
 
                                     @stack('grand_total_td_start')
                                         <tr id="tr-total">
-                                            <td class="text-right border-right-0" colspan="5">
+                                            <td class="text-right border-right-0" colspan="5" :colspan="colspan">
                                                 <strong>{{ trans('bills.total') }}</strong>
                                             </td>
                                             <td class="text-right long-texts">
diff --git a/resources/views/sales/invoices/create.blade.php b/resources/views/sales/invoices/create.blade.php
index d32cdf149..a6fc4001e 100644
--- a/resources/views/sales/invoices/create.blade.php
+++ b/resources/views/sales/invoices/create.blade.php
@@ -69,13 +69,13 @@
                                                 <button type="button" @click="onAddItem" id="button-add-item" data-toggle="tooltip" title="{{ trans('general.add') }}" class="btn btn-icon btn-outline-success btn-lg" data-original-title="{{ trans('general.add') }}"><i class="fa fa-plus"></i>
                                                 </button>
                                             </td>
-                                            <td class="text-right border-bottom-0" colspan="5"></td>
+                                            <td class="text-right border-bottom-0" colspan="5" :colspan="colspan"></td>
                                         </tr>
                                     @stack('add_item_td_end')
 
                                     @stack('sub_total_td_start')
                                         <tr id="tr-subtotal">
-                                            <td class="text-right border-right-0 border-bottom-0" colspan="5">
+                                            <td class="text-right border-right-0 border-bottom-0" colspan="5" :colspan="colspan">
                                                 <strong>{{ trans('invoices.sub_total') }}</strong>
                                             </td>
                                             <td class="text-right border-bottom-0 long-texts">
@@ -88,7 +88,7 @@
 
                                     @stack('add_discount_td_start')
                                         <tr id="tr-discount">
-                                            <td class="text-right border-right-0 border-bottom-0" colspan="5">
+                                            <td class="text-right border-right-0 border-bottom-0" colspan="5" :colspan="colspan">
                                                 <el-popover
                                                     popper-class="p-0 h-0"
                                                     placement="bottom"
@@ -140,7 +140,7 @@
 
                                     @stack('tax_total_td_start')
                                         <tr id="tr-tax">
-                                            <td class="text-right border-right-0 border-bottom-0" colspan="5">
+                                            <td class="text-right border-right-0 border-bottom-0" colspan="5" :colspan="colspan">
                                                 <strong>{{ trans_choice('general.taxes', 1) }}</strong>
                                             </td>
                                             <td class="text-right border-bottom-0 long-texts">
@@ -153,7 +153,7 @@
 
                                     @stack('grand_total_td_start')
                                         <tr id="tr-total">
-                                            <td class="text-right border-right-0" colspan="5">
+                                            <td class="text-right border-right-0" colspan="5" :colspan="colspan">
                                                 <strong>{{ trans('invoices.total') }}</strong>
                                             </td>
                                             <td class="text-right long-texts">
diff --git a/resources/views/sales/invoices/edit.blade.php b/resources/views/sales/invoices/edit.blade.php
index 72aec97ee..41e933e17 100644
--- a/resources/views/sales/invoices/edit.blade.php
+++ b/resources/views/sales/invoices/edit.blade.php
@@ -70,13 +70,13 @@
                                                 <button type="button" @click="onAddItem" id="button-add-item" data-toggle="tooltip" title="{{ trans('general.add') }}" class="btn btn-icon btn-outline-success btn-lg" data-original-title="{{ trans('general.add') }}"><i class="fa fa-plus"></i>
                                                 </button>
                                             </td>
-                                            <td class="text-right border-bottom-0" colspan="5"></td>
+                                            <td class="text-right border-bottom-0" colspan="5" :colspan="colspan"></td>
                                         </tr>
                                     @stack('add_item_td_end')
 
                                     @stack('sub_total_td_start')
                                         <tr id="tr-subtotal">
-                                            <td class="text-right border-right-0 border-bottom-0" colspan="5">
+                                            <td class="text-right border-right-0 border-bottom-0" colspan="5" :colspan="colspan">
                                                 <strong>{{ trans('invoices.sub_total') }}</strong>
                                             </td>
                                             <td class="text-right border-bottom-0 long-texts">
@@ -89,7 +89,7 @@
 
                                     @stack('add_discount_td_start')
                                         <tr id="tr-discount">
-                                            <td class="text-right border-right-0 border-bottom-0" colspan="5">
+                                            <td class="text-right border-right-0 border-bottom-0" colspan="5" :colspan="colspan">
                                                 <el-popover
                                                     popper-class="p-0 h-0"
                                                     placement="bottom"
@@ -141,7 +141,7 @@
 
                                     @stack('tax_total_td_start')
                                         <tr id="tr-tax">
-                                            <td class="text-right border-right-0 border-bottom-0" colspan="5">
+                                            <td class="text-right border-right-0 border-bottom-0" colspan="5" :colspan="colspan">
                                                 <strong>{{ trans_choice('general.taxes', 1) }}</strong>
                                             </td>
                                             <td class="text-right border-bottom-0 long-texts">
@@ -154,7 +154,7 @@
 
                                     @stack('grand_total_td_start')
                                         <tr id="tr-total">
-                                            <td class="text-right border-right-0" colspan="5">
+                                            <td class="text-right border-right-0" colspan="5" :colspan="colspan">
                                                 <strong>{{ trans('invoices.total') }}</strong>
                                             </td>
                                             <td class="text-right long-texts">

From 934d1d0b7e6a5a4ffbb6771b9cb502de1f05709e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Wed, 11 Mar 2020 19:29:36 +0300
Subject: [PATCH 42/65] Invoice and bill item tax issue solved.

---
 .../assets/js/components/AkauntingSelect.vue  | 46 ++++++++++++++++---
 .../views/purchases/bills/item.blade.php      | 10 ++--
 resources/views/sales/invoices/item.blade.php | 10 ++--
 3 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/resources/assets/js/components/AkauntingSelect.vue b/resources/assets/js/components/AkauntingSelect.vue
index 3ba0d9109..21bb91cda 100644
--- a/resources/assets/js/components/AkauntingSelect.vue
+++ b/resources/assets/js/components/AkauntingSelect.vue
@@ -533,6 +533,7 @@ export default {
             add_new_html: '',
             form: {},
             new_options: false,
+            hide_selected: false,
         }
     },
 
@@ -548,23 +549,41 @@ export default {
 
     methods: {
         change() {
+            if (typeof(this.real_model) === 'object') {
+                return false;
+            }
+
             this.$emit('change', this.real_model);
             this.$emit('interface', this.real_model);
         },
 
-        onAddItem() {
+        async onAddItem() {
+            if (this.multiple) {
+                this.hide_selected = this.real_model;
+            }
+
             // Get Select Input value
-            var value = this.$children[0].$children[0].$children[0].$refs.input.value;
+            if (this.title) {
+                var value = this.$children[0].$children[0].$children[0].$refs.input.value;
+            } else {
+                var value = this.$children[0].$children[0].$refs.input.value;
+            }
 
             if (this.add_new.type == 'inline') {
-                this.addInline(value);
+                if (value === '') {
+                    return false;
+                }
+
+                await this.addInline(value);
             } else {
-                this.onModal(value);
+                await this.onModal(value);
             }
         },
 
         addInline(value) {
-
+            if (this.multiple) {
+                this.hide_selected = false;
+            }
         },
 
         onModal(value) {
@@ -662,7 +681,12 @@ export default {
                 if (response.data.success) {
                     this.selectOptions[response.data.data[this.add_new.field.key]] = response.data.data[this.add_new.field.value];
                     this.new_options[response.data.data[this.add_new.field.key]] = response.data.data[this.add_new.field.value];
-                    this.real_model = response.data.data[this.add_new.field.key].toString();
+
+                    if (this.multiple) {
+                        this.real_model.push(response.data.data[this.add_new.field.key].toString());
+                    } else {
+                        this.real_model = response.data.data[this.add_new.field.key].toString();
+                    }
 
                     this.change();
 
@@ -670,6 +694,10 @@ export default {
 
                     this.add_new.html = '';
                     this.add_new_html = null;
+
+                    if (this.multiple) {
+                        this.hide_selected = false;
+                    }
                 }
             })
             .catch(error => {
@@ -706,6 +734,12 @@ export default {
             }
         },
 
+        real_model: function (value) {
+            if (this.multiple && this.hide_selected) {
+                this.real_model = this.hide_selected;
+            }
+        },
+
         value: function (value) {
             if (this.multiple) {
                 this.real_model = value;
diff --git a/resources/views/purchases/bills/item.blade.php b/resources/views/purchases/bills/item.blade.php
index aca9092ee..85eabcbdd 100644
--- a/resources/views/purchases/bills/item.blade.php
+++ b/resources/views/purchases/bills/item.blade.php
@@ -104,7 +104,7 @@
             @stack('tax_id_input_start')
             <akaunting-select
                 class="mb-0 select-tax"
-                :form-classes="[{'has-error': form.errors.has('tax_id') }]"
+                :form-classes="[{'has-error': form.errors.has('items.' + index + '.tax_id') }]"
                 :icon="''"
                 :title="''"
                 :placeholder="'{{ trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)]) }}'"
@@ -117,7 +117,11 @@
                     'text' => trans('general.add_new'),
                     'path' => route('modals.taxes.create'),
                     'type' => 'modal',
-                    'field' => 'name',
+                    'field' => [
+                        'key' => 'id',
+                        'value' => 'title'
+                    ],
+                    'new_text' => trans('modules.new'),
                     'buttons' => [
                         'cancel' => [
                             'text' => trans('general.cancel'),
@@ -132,7 +136,7 @@
                 :collapse="false"
                 @interface="row.tax_id = $event"
                 @change="onCalculateTotal($event)"
-                :form-error="form.errors.get('tax_id')"
+                :form-error="form.errors.get('items.' + index + '.tax_id')"
                 :no-data-text="'{{ trans('general.no_data') }}'"
                 :no-matching-data-text="'{{ trans('general.no_matching_data') }}'"
             ></akaunting-select>
diff --git a/resources/views/sales/invoices/item.blade.php b/resources/views/sales/invoices/item.blade.php
index 103e73fa8..127b7834e 100644
--- a/resources/views/sales/invoices/item.blade.php
+++ b/resources/views/sales/invoices/item.blade.php
@@ -104,7 +104,7 @@
             @stack('tax_id_input_start')
             <akaunting-select
                 class="mb-0 select-tax"
-                :form-classes="[{'has-error': form.errors.has('tax_id') }]"
+                :form-classes="[{'has-error': form.errors.has('items.' + index + '.tax_id') }]"
                 :icon="''"
                 :title="''"
                 :placeholder="'{{ trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)]) }}'"
@@ -117,7 +117,11 @@
                     'text' => trans('general.add_new'),
                     'path' => route('modals.taxes.create'),
                     'type' => 'modal',
-                    'field' => 'name',
+                    'field' => [
+                        'key' => 'id',
+                        'value' => 'title'
+                    ],
+                    'new_text' => trans('modules.new'),
                     'buttons' => [
                         'cancel' => [
                             'text' => trans('general.cancel'),
@@ -132,7 +136,7 @@
                 :collapse="false"
                 @interface="row.tax_id = $event"
                 @change="onCalculateTotal($event)"
-                :form-error="form.errors.get('tax_id')"
+                :form-error="form.errors.get('items.' + index + '.tax_id')"
                 :no-data-text="'{{ trans('general.no_data') }}'"
                 :no-matching-data-text="'{{ trans('general.no_matching_data') }}'"
             ></akaunting-select>

From 11d67ffba58686a422e31e05eacb8211b03730af Mon Sep 17 00:00:00 2001
From: Sevan Nerse <nerse.sevan@gmail.com>
Date: Wed, 11 Mar 2020 22:16:52 +0300
Subject: [PATCH 43/65] CreateTransaction job is improved

---
 app/Events/Banking/TransactionCreated.php  | 22 ++++++++++++++++++++++
 app/Events/Banking/TransactionCreating.php | 22 ++++++++++++++++++++++
 app/Jobs/Banking/CreateTransaction.php     | 16 ++++++++++++----
 3 files changed, 56 insertions(+), 4 deletions(-)
 create mode 100644 app/Events/Banking/TransactionCreated.php
 create mode 100644 app/Events/Banking/TransactionCreating.php

diff --git a/app/Events/Banking/TransactionCreated.php b/app/Events/Banking/TransactionCreated.php
new file mode 100644
index 000000000..d7da55c57
--- /dev/null
+++ b/app/Events/Banking/TransactionCreated.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Events\Banking;
+
+use Illuminate\Queue\SerializesModels;
+
+class TransactionCreated
+{
+    use SerializesModels;
+
+    public $transaction;
+
+    /**
+     * Create a new event instance.
+     *
+     * @param $transaction
+     */
+    public function __construct($transaction)
+    {
+        $this->transaction = $transaction;
+    }
+}
diff --git a/app/Events/Banking/TransactionCreating.php b/app/Events/Banking/TransactionCreating.php
new file mode 100644
index 000000000..1e3252625
--- /dev/null
+++ b/app/Events/Banking/TransactionCreating.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Events\Banking;
+
+use Illuminate\Queue\SerializesModels;
+
+class TransactionCreating
+{
+    use SerializesModels;
+
+    public $request;
+
+    /**
+     * Create a new event instance.
+     *
+     * @param $request
+     */
+    public function __construct($request)
+    {
+        $this->request = $request;
+    }
+}
diff --git a/app/Jobs/Banking/CreateTransaction.php b/app/Jobs/Banking/CreateTransaction.php
index 7b03c2f41..6c31ca9ea 100644
--- a/app/Jobs/Banking/CreateTransaction.php
+++ b/app/Jobs/Banking/CreateTransaction.php
@@ -4,10 +4,14 @@ namespace App\Jobs\Banking;
 
 use App\Abstracts\Job;
 use App\Models\Banking\Transaction;
+use App\Events\Banking\TransactionCreated;
+use App\Events\Banking\TransactionCreating;
 
 class CreateTransaction extends Job
 {
     protected $request;
+    
+    protected $transaction;
 
     /**
      * Create a new job instance.
@@ -26,18 +30,22 @@ class CreateTransaction extends Job
      */
     public function handle()
     {
-        $transaction = Transaction::create($this->request->all());
+        event(new TransactionCreating($this->request));
+
+        $this->transaction = Transaction::create($this->request->all());
 
         // Upload attachment
         if ($this->request->file('attachment')) {
             $media = $this->getMedia($this->request->file('attachment'), 'transactions');
 
-            $transaction->attachMedia($media, 'attachment');
+            $this->transaction->attachMedia($media, 'attachment');
         }
 
         // Recurring
-        $transaction->createRecurring();
+        $this->transaction->createRecurring();
 
-        return $transaction;
+        event(new TransactionCreated($this->transaction));
+
+        return $this->transaction;
     }
 }

From 49d068f2dce4b0259f1b884913ab4e87989b2968 Mon Sep 17 00:00:00 2001
From: denisdulici <denisdulici@gmail.com>
Date: Thu, 12 Mar 2020 14:29:21 +0300
Subject: [PATCH 44/65] styling

---
 app/Jobs/Banking/CreateTransaction.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Jobs/Banking/CreateTransaction.php b/app/Jobs/Banking/CreateTransaction.php
index 6c31ca9ea..37ff1f4e3 100644
--- a/app/Jobs/Banking/CreateTransaction.php
+++ b/app/Jobs/Banking/CreateTransaction.php
@@ -3,14 +3,14 @@
 namespace App\Jobs\Banking;
 
 use App\Abstracts\Job;
-use App\Models\Banking\Transaction;
 use App\Events\Banking\TransactionCreated;
 use App\Events\Banking\TransactionCreating;
+use App\Models\Banking\Transaction;
 
 class CreateTransaction extends Job
 {
     protected $request;
-    
+
     protected $transaction;
 
     /**

From 5f490ad0cbf1c76c29dc99de731262c581e4cdd2 Mon Sep 17 00:00:00 2001
From: denisdulici <denisdulici@gmail.com>
Date: Thu, 12 Mar 2020 15:13:03 +0300
Subject: [PATCH 45/65] fixed changelog

---
 app/Utilities/Versions.php | 6 ++----
 composer.json              | 1 +
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/Utilities/Versions.php b/app/Utilities/Versions.php
index de798909e..6406b7457 100644
--- a/app/Utilities/Versions.php
+++ b/app/Utilities/Versions.php
@@ -6,8 +6,8 @@ use Akaunting\Module\Module;
 use App\Traits\SiteApi;
 use Cache;
 use Date;
+use GrahamCampbell\Markdown\Facades\Markdown;
 use Illuminate\Support\Arr;
-use Parsedown;
 
 class Versions
 {
@@ -27,8 +27,6 @@ class Versions
             return $output;
         }
 
-        $parsedown = new Parsedown();
-
         $releases = json_decode($json);
 
         foreach ($releases as $release) {
@@ -46,7 +44,7 @@ class Versions
 
             $output .= '<h2><span class="badge badge-pill badge-success">' . $release->tag_name . '</span></h2>';
 
-            $output .= $parsedown->text($release->body);
+            $output .= Markdown::convertToHtml($release->body);
 
             $output .= '<hr>';
         }
diff --git a/composer.json b/composer.json
index d9baa9b04..6b925208d 100644
--- a/composer.json
+++ b/composer.json
@@ -30,6 +30,7 @@
         "doctrine/dbal": "2.9.*",
         "fideloper/proxy": "4.2.*",
         "genealabs/laravel-model-caching": "0.7.*",
+        "graham-campbell/markdown": "12.0.*",
         "guzzlehttp/guzzle": "6.5.*",
         "intervention/image": "2.5.*",
         "jenssegers/date": "3.5.*",

From 0b8871ae635d6ece1054add30dde7ef0451ceb74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Thu, 12 Mar 2020 15:20:45 +0300
Subject: [PATCH 46/65] composer.lock file update..

---
 composer.lock | 384 +++++++++++++++++++++++---------------------------
 1 file changed, 173 insertions(+), 211 deletions(-)

diff --git a/composer.lock b/composer.lock
index 1209bd6e3..86ccdc6c0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,20 +4,20 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "6215fc14abaa7d8b9299f201ffef54aa",
+    "content-hash": "34d0e7bb65350432e47868ee5e5661e3",
     "packages": [
         {
             "name": "akaunting/firewall",
-            "version": "1.2.8",
+            "version": "1.2.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/akaunting/firewall.git",
-                "reference": "3ab35b816a3aa6ee60c630c2ba53563ff5bd3c7e"
+                "reference": "4841fb744976d5f0a0e3c85982e788a3ba6990ba"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/akaunting/firewall/zipball/3ab35b816a3aa6ee60c630c2ba53563ff5bd3c7e",
-                "reference": "3ab35b816a3aa6ee60c630c2ba53563ff5bd3c7e",
+                "url": "https://api.github.com/repos/akaunting/firewall/zipball/4841fb744976d5f0a0e3c85982e788a3ba6990ba",
+                "reference": "4841fb744976d5f0a0e3c85982e788a3ba6990ba",
                 "shasum": ""
             },
             "require": {
@@ -27,8 +27,8 @@
                 "php": ">=5.6.4"
             },
             "require-dev": {
-                "orchestra/testbench": "3.4.*|3.5.*|3.6.*|3.7.*|3.8.*",
-                "phpunit/phpunit": "5.7.*"
+                "orchestra/testbench": ">=3.4",
+                "phpunit/phpunit": ">=5.7"
             },
             "type": "library",
             "extra": {
@@ -67,24 +67,24 @@
                 "waf",
                 "xss"
             ],
-            "time": "2020-02-24T22:27:02+00:00"
+            "time": "2020-03-07T22:10:02+00:00"
         },
         {
             "name": "akaunting/language",
-            "version": "1.0.13",
+            "version": "1.0.16",
             "source": {
                 "type": "git",
                 "url": "https://github.com/akaunting/language.git",
-                "reference": "d578be3b3a0cce40b9c9949c5360e4ac7e18b8bd"
+                "reference": "ba89481c2d16dbe7554c6b1a1e9deaf89d8ec7d0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/akaunting/language/zipball/d578be3b3a0cce40b9c9949c5360e4ac7e18b8bd",
-                "reference": "d578be3b3a0cce40b9c9949c5360e4ac7e18b8bd",
+                "url": "https://api.github.com/repos/akaunting/language/zipball/ba89481c2d16dbe7554c6b1a1e9deaf89d8ec7d0",
+                "reference": "ba89481c2d16dbe7554c6b1a1e9deaf89d8ec7d0",
                 "shasum": ""
             },
             "require": {
-                "consoletvs/identify": "1.*",
+                "jenssegers/agent": "2.6.*",
                 "laravel/framework": ">=5.4.0",
                 "php": ">=5.6.4"
             },
@@ -125,20 +125,20 @@
                 "laravel",
                 "switcher"
             ],
-            "time": "2019-11-02T07:15:59+00:00"
+            "time": "2020-03-09T21:53:59+00:00"
         },
         {
             "name": "akaunting/menu",
-            "version": "1.0.8",
+            "version": "1.0.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/akaunting/menu.git",
-                "reference": "5354bd302c77185f42ce1f4f668c774ed82d0184"
+                "reference": "3b8b703a149fee090af9468be531bb335e2d8f88"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/akaunting/menu/zipball/5354bd302c77185f42ce1f4f668c774ed82d0184",
-                "reference": "5354bd302c77185f42ce1f4f668c774ed82d0184",
+                "url": "https://api.github.com/repos/akaunting/menu/zipball/3b8b703a149fee090af9468be531bb335e2d8f88",
+                "reference": "3b8b703a149fee090af9468be531bb335e2d8f88",
                 "shasum": ""
             },
             "require": {
@@ -150,9 +150,9 @@
             },
             "require-dev": {
                 "friendsofphp/php-cs-fixer": "^2.10",
-                "mockery/mockery": "~1.0",
-                "orchestra/testbench": "3.8.*",
-                "phpunit/phpunit": "~7.0"
+                "mockery/mockery": ">=1.0",
+                "orchestra/testbench": ">=3.8",
+                "phpunit/phpunit": ">=7.0"
             },
             "type": "library",
             "extra": {
@@ -193,32 +193,32 @@
                 "navigation",
                 "sidebar"
             ],
-            "time": "2020-02-07T12:06:55+00:00"
+            "time": "2020-03-07T22:36:44+00:00"
         },
         {
             "name": "akaunting/module",
-            "version": "1.0.9",
+            "version": "1.0.10",
             "source": {
                 "type": "git",
                 "url": "https://github.com/akaunting/module.git",
-                "reference": "c7ca47914e8fae07b7ea72d1bfe7345b2ed7da52"
+                "reference": "ab24ced4d42716782424227002b670e29cffabbb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/akaunting/module/zipball/c7ca47914e8fae07b7ea72d1bfe7345b2ed7da52",
-                "reference": "c7ca47914e8fae07b7ea72d1bfe7345b2ed7da52",
+                "url": "https://api.github.com/repos/akaunting/module/zipball/ab24ced4d42716782424227002b670e29cffabbb",
+                "reference": "ab24ced4d42716782424227002b670e29cffabbb",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1"
             },
             "require-dev": {
-                "friendsofphp/php-cs-fixer": "^2.15",
-                "mockery/mockery": "~1.0",
-                "orchestra/testbench": "^3.8",
-                "phpstan/phpstan": "^0.9.2",
-                "phpunit/phpunit": "~7.0|~8.0",
-                "spatie/phpunit-snapshot-assertions": "^2.1.0"
+                "friendsofphp/php-cs-fixer": ">=2.15",
+                "mockery/mockery": ">=1.0",
+                "orchestra/testbench": ">=3.8",
+                "phpstan/phpstan": ">=0.9.2",
+                "phpunit/phpunit": ">=7.0",
+                "spatie/phpunit-snapshot-assertions": ">=2.1.0"
             },
             "type": "library",
             "extra": {
@@ -258,30 +258,30 @@
                 "module",
                 "rad"
             ],
-            "time": "2020-02-07T13:52:54+00:00"
+            "time": "2020-03-07T22:53:21+00:00"
         },
         {
             "name": "akaunting/money",
-            "version": "1.0.14",
+            "version": "1.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/akaunting/money.git",
-                "reference": "058b2256344ca5cb17aa1fecb574f5264a2444ef"
+                "reference": "1bab074aa71ed994eff140b26fb6ce9aecf82430"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/akaunting/money/zipball/058b2256344ca5cb17aa1fecb574f5264a2444ef",
-                "reference": "058b2256344ca5cb17aa1fecb574f5264a2444ef",
+                "url": "https://api.github.com/repos/akaunting/money/zipball/1bab074aa71ed994eff140b26fb6ce9aecf82430",
+                "reference": "1bab074aa71ed994eff140b26fb6ce9aecf82430",
                 "shasum": ""
             },
             "require": {
-                "illuminate/support": ">=5.2",
-                "illuminate/view": ">=5.2",
-                "php": ">=5.5.9"
+                "illuminate/support": ">=5.4",
+                "illuminate/view": ">=5.4",
+                "php": ">=5.6.4"
             },
             "require-dev": {
-                "mockery/mockery": "~0.9",
-                "phpunit/phpunit": "~4.0"
+                "mockery/mockery": ">=1.0",
+                "phpunit/phpunit": ">=5.7"
             },
             "type": "library",
             "extra": {
@@ -319,7 +319,7 @@
                 "laravel",
                 "money"
             ],
-            "time": "2019-12-26T08:11:31+00:00"
+            "time": "2020-03-09T15:01:03+00:00"
         },
         {
             "name": "akaunting/setting",
@@ -840,16 +840,16 @@
         },
         {
             "name": "composer/composer",
-            "version": "1.9.3",
+            "version": "1.10.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/composer.git",
-                "reference": "1291a16ce3f48bfdeca39d64fca4875098af4d7b"
+                "reference": "472c917b2a083ec7d2fa25c55fd099d1300e2515"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/composer/zipball/1291a16ce3f48bfdeca39d64fca4875098af4d7b",
-                "reference": "1291a16ce3f48bfdeca39d64fca4875098af4d7b",
+                "url": "https://api.github.com/repos/composer/composer/zipball/472c917b2a083ec7d2fa25c55fd099d1300e2515",
+                "reference": "472c917b2a083ec7d2fa25c55fd099d1300e2515",
                 "shasum": ""
             },
             "require": {
@@ -862,17 +862,17 @@
                 "psr/log": "^1.0",
                 "seld/jsonlint": "^1.4",
                 "seld/phar-utils": "^1.0",
-                "symfony/console": "^2.7 || ^3.0 || ^4.0",
-                "symfony/filesystem": "^2.7 || ^3.0 || ^4.0",
-                "symfony/finder": "^2.7 || ^3.0 || ^4.0",
-                "symfony/process": "^2.7 || ^3.0 || ^4.0"
+                "symfony/console": "^2.7 || ^3.0 || ^4.0 || ^5.0",
+                "symfony/filesystem": "^2.7 || ^3.0 || ^4.0 || ^5.0",
+                "symfony/finder": "^2.7 || ^3.0 || ^4.0 || ^5.0",
+                "symfony/process": "^2.7 || ^3.0 || ^4.0 || ^5.0"
             },
             "conflict": {
                 "symfony/console": "2.8.38"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7",
-                "phpunit/phpunit-mock-objects": "^2.3 || ^3.0"
+                "phpspec/prophecy": "^1.10",
+                "symfony/phpunit-bridge": "^3.4"
             },
             "suggest": {
                 "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
@@ -885,7 +885,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.9-dev"
+                    "dev-master": "1.10-dev"
                 }
             },
             "autoload": {
@@ -916,7 +916,7 @@
                 "dependency",
                 "package"
             ],
-            "time": "2020-02-04T11:58:49+00:00"
+            "time": "2020-03-10T13:08:05+00:00"
         },
         {
             "name": "composer/semver",
@@ -1129,55 +1129,6 @@
             "description": "The laravel charting package",
             "time": "2020-03-03T23:16:14+00:00"
         },
-        {
-            "name": "consoletvs/identify",
-            "version": "1.3.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/ConsoleTVs/Identify.git",
-                "reference": "ef5540a7c56b291f3633bef0f8ceb78c2d7f754e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/ConsoleTVs/Identify/zipball/ef5540a7c56b291f3633bef0f8ceb78c2d7f754e",
-                "reference": "ef5540a7c56b291f3633bef0f8ceb78c2d7f754e",
-                "shasum": ""
-            },
-            "require": {
-                "illuminate/support": "^5.0|^6.0",
-                "php": ">=5.5.9",
-                "sinergi/browser-detector": "6.0.*"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Unicodeveloper\\Identify\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "unicodeveloper",
-                    "email": "prosperotemuyiwa@gmail.com"
-                }
-            ],
-            "description": "A Laravel 5 Package Provider to Identify/detect a user's browser, device, operating system and Language",
-            "keywords": [
-                "Evangelist",
-                "browser",
-                "detect",
-                "github",
-                "identify",
-                "language",
-                "laravel",
-                "open source",
-                "operating system"
-            ],
-            "time": "2019-09-09T19:24:02+00:00"
-        },
         {
             "name": "dingo/api",
             "version": "v2.4.5",
@@ -2202,6 +2153,73 @@
             ],
             "time": "2019-09-14T00:26:49+00:00"
         },
+        {
+            "name": "graham-campbell/markdown",
+            "version": "v12.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/GrahamCampbell/Laravel-Markdown.git",
+                "reference": "1566129f213adf7f508e0bebc2399102c4c78cd6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/GrahamCampbell/Laravel-Markdown/zipball/1566129f213adf7f508e0bebc2399102c4c78cd6",
+                "reference": "1566129f213adf7f508e0bebc2399102c4c78cd6",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/contracts": "^6.0|^7.0",
+                "illuminate/support": "^6.0|^7.0",
+                "illuminate/view": "^6.0|^7.0",
+                "league/commonmark": "^1.3",
+                "php": "^7.2.5"
+            },
+            "require-dev": {
+                "graham-campbell/analyzer": "^3.0",
+                "graham-campbell/testbench": "^5.4",
+                "mockery/mockery": "^1.3.1",
+                "phpunit/phpunit": "^8.5|^9.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "12.0-dev"
+                },
+                "laravel": {
+                    "providers": [
+                        "GrahamCampbell\\Markdown\\MarkdownServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GrahamCampbell\\Markdown\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Graham Campbell",
+                    "email": "graham@alt-three.com"
+                }
+            ],
+            "description": "Markdown Is A CommonMark Wrapper For Laravel",
+            "keywords": [
+                "Graham Campbell",
+                "GrahamCampbell",
+                "Laravel Markdown",
+                "Laravel-Markdown",
+                "common mark",
+                "commonmark",
+                "framework",
+                "laravel",
+                "markdown"
+            ],
+            "time": "2020-03-01T11:40:45+00:00"
+        },
         {
             "name": "guzzlehttp/guzzle",
             "version": "6.5.2",
@@ -2845,26 +2863,26 @@
         },
         {
             "name": "kyslik/column-sortable",
-            "version": "6.2.1",
+            "version": "6.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/Kyslik/column-sortable.git",
-                "reference": "2fecd327c29ae925bf951f787a41e4e7ca315446"
+                "reference": "9f2ddfabe5cfd9cfd67b15805e2d0de48429c995"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/Kyslik/column-sortable/zipball/2fecd327c29ae925bf951f787a41e4e7ca315446",
-                "reference": "2fecd327c29ae925bf951f787a41e4e7ca315446",
+                "url": "https://api.github.com/repos/Kyslik/column-sortable/zipball/9f2ddfabe5cfd9cfd67b15805e2d0de48429c995",
+                "reference": "9f2ddfabe5cfd9cfd67b15805e2d0de48429c995",
                 "shasum": ""
             },
             "require": {
-                "illuminate/database": "5.8.*|^6.0",
-                "illuminate/support": "5.8.*|^6.0",
+                "illuminate/database": "5.8.*|^6.0|^7.0",
+                "illuminate/support": "5.8.*|^6.0|^7.0",
                 "php": ">=7.2"
             },
             "require-dev": {
-                "orchestra/testbench": "^4.0",
-                "phpunit/phpunit": "^8.0"
+                "orchestra/testbench": "^5.0",
+                "phpunit/phpunit": "^8.5"
             },
             "type": "package",
             "extra": {
@@ -2898,7 +2916,7 @@
                 "sortable",
                 "sorting"
             ],
-            "time": "2020-03-01T20:53:06+00:00"
+            "time": "2020-03-08T12:26:23+00:00"
         },
         {
             "name": "laracasts/flash",
@@ -2956,16 +2974,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v6.18.0",
+            "version": "v6.18.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "077b895d935b7fbcfb1d1eb34217fa4f80a130d8"
+                "reference": "367c2c8dfdfe83cb2ddbc029c0222174098d093a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/077b895d935b7fbcfb1d1eb34217fa4f80a130d8",
-                "reference": "077b895d935b7fbcfb1d1eb34217fa4f80a130d8",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/367c2c8dfdfe83cb2ddbc029c0222174098d093a",
+                "reference": "367c2c8dfdfe83cb2ddbc029c0222174098d093a",
                 "shasum": ""
             },
             "require": {
@@ -3098,7 +3116,7 @@
                 "framework",
                 "laravel"
             ],
-            "time": "2020-03-03T13:14:27+00:00"
+            "time": "2020-03-10T14:11:04+00:00"
         },
         {
             "name": "laravel/tinker",
@@ -3307,16 +3325,16 @@
         },
         {
             "name": "league/flysystem",
-            "version": "1.0.64",
+            "version": "1.0.65",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/flysystem.git",
-                "reference": "d13c43dbd4b791f815215959105a008515d1a2e0"
+                "reference": "8f17b3ba67097aafb8318cd5c553b1acf7c891c8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/d13c43dbd4b791f815215959105a008515d1a2e0",
-                "reference": "d13c43dbd4b791f815215959105a008515d1a2e0",
+                "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/8f17b3ba67097aafb8318cd5c553b1acf7c891c8",
+                "reference": "8f17b3ba67097aafb8318cd5c553b1acf7c891c8",
                 "shasum": ""
             },
             "require": {
@@ -3387,7 +3405,7 @@
                 "sftp",
                 "storage"
             ],
-            "time": "2020-02-05T18:14:17+00:00"
+            "time": "2020-03-08T18:53:20+00:00"
         },
         {
             "name": "league/fractal",
@@ -3568,30 +3586,30 @@
         },
         {
             "name": "markbaker/complex",
-            "version": "1.4.7",
+            "version": "1.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/MarkBaker/PHPComplex.git",
-                "reference": "1ea674a8308baf547cbcbd30c5fcd6d301b7c000"
+                "reference": "8eaa40cceec7bf0518187530b2e63871be661b72"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/MarkBaker/PHPComplex/zipball/1ea674a8308baf547cbcbd30c5fcd6d301b7c000",
-                "reference": "1ea674a8308baf547cbcbd30c5fcd6d301b7c000",
+                "url": "https://api.github.com/repos/MarkBaker/PHPComplex/zipball/8eaa40cceec7bf0518187530b2e63871be661b72",
+                "reference": "8eaa40cceec7bf0518187530b2e63871be661b72",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.6.0|^7.0.0"
             },
             "require-dev": {
-                "dealerdirect/phpcodesniffer-composer-installer": "^0.4.3",
-                "phpcompatibility/php-compatibility": "^8.0",
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",
+                "phpcompatibility/php-compatibility": "^9.0",
                 "phpdocumentor/phpdocumentor": "2.*",
                 "phploc/phploc": "2.*",
                 "phpmd/phpmd": "2.*",
                 "phpunit/phpunit": "^4.8.35|^5.4.0",
                 "sebastian/phpcpd": "2.*",
-                "squizlabs/php_codesniffer": "^3.3.0"
+                "squizlabs/php_codesniffer": "^3.4.0"
             },
             "type": "library",
             "autoload": {
@@ -3659,7 +3677,7 @@
                 "complex",
                 "mathematics"
             ],
-            "time": "2018-10-13T23:28:42+00:00"
+            "time": "2020-03-11T20:15:49+00:00"
         },
         {
             "name": "markbaker/matrix",
@@ -5148,21 +5166,21 @@
         },
         {
             "name": "santigarcor/laratrust",
-            "version": "5.2.7",
+            "version": "5.2.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/santigarcor/laratrust.git",
-                "reference": "f9ff044424e9520ccc93f4435acc4985ccf68bdd"
+                "reference": "c709f44509cf1371b777a01b6eca210bc34a06f8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/santigarcor/laratrust/zipball/f9ff044424e9520ccc93f4435acc4985ccf68bdd",
-                "reference": "f9ff044424e9520ccc93f4435acc4985ccf68bdd",
+                "url": "https://api.github.com/repos/santigarcor/laratrust/zipball/c709f44509cf1371b777a01b6eca210bc34a06f8",
+                "reference": "c709f44509cf1371b777a01b6eca210bc34a06f8",
                 "shasum": ""
             },
             "require": {
                 "kkszymanowski/traitor": "^0.2.0",
-                "laravel/framework": "~5.6.0|~5.7.0|~5.8.0|~6.0",
+                "laravel/framework": "~5.6.0|~5.7.0|~5.8.0|~6.0|~7.0",
                 "php": "^7.1"
             },
             "require-dev": {
@@ -5209,7 +5227,7 @@
                 "rbac",
                 "roles"
             ],
-            "time": "2020-02-19T13:24:04+00:00"
+            "time": "2020-03-09T08:19:36+00:00"
         },
         {
             "name": "seld/jsonlint",
@@ -5358,62 +5376,6 @@
             ],
             "time": "2019-11-18T17:48:08+00:00"
         },
-        {
-            "name": "sinergi/browser-detector",
-            "version": "6.0.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sinergi/php-browser-detector.git",
-                "reference": "7fcda47cf2690fb978c8cee3ba7304b7dca1bcc7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sinergi/php-browser-detector/zipball/7fcda47cf2690fb978c8cee3ba7304b7dca1bcc7",
-                "reference": "7fcda47cf2690fb978c8cee3ba7304b7dca1bcc7",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.3 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8 || ^5.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-develop": "6.1-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Sinergi\\BrowserDetector\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Chris Schuld",
-                    "email": "chris@chrisschuld.com",
-                    "homepage": "http://chrisschuld.com"
-                },
-                {
-                    "name": "Gabriel Bull",
-                    "email": "me@gabrielbull.com"
-                }
-            ],
-            "description": "Detecting the user's browser, operating system and language.",
-            "keywords": [
-                "browser",
-                "detection",
-                "language",
-                "operating system",
-                "os"
-            ],
-            "time": "2016-07-28T15:35:24+00:00"
-        },
         {
             "name": "staudenmeir/belongs-to-through",
             "version": "v2.9",
@@ -5934,26 +5896,26 @@
         },
         {
             "name": "symfony/filesystem",
-            "version": "v4.4.5",
+            "version": "v5.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "266c9540b475f26122b61ef8b23dd9198f5d1cfd"
+                "reference": "3afadc0f57cd74f86379d073e694b0f2cda2a88c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/266c9540b475f26122b61ef8b23dd9198f5d1cfd",
-                "reference": "266c9540b475f26122b61ef8b23dd9198f5d1cfd",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/3afadc0f57cd74f86379d073e694b0f2cda2a88c",
+                "reference": "3afadc0f57cd74f86379d073e694b0f2cda2a88c",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.1.3",
+                "php": "^7.2.5",
                 "symfony/polyfill-ctype": "~1.8"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.4-dev"
+                    "dev-master": "5.0-dev"
                 }
             },
             "autoload": {
@@ -5980,7 +5942,7 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
-            "time": "2020-01-21T08:20:44+00:00"
+            "time": "2020-01-21T08:40:24+00:00"
         },
         {
             "name": "symfony/finder",
@@ -7310,16 +7272,16 @@
         },
         {
             "name": "facade/ignition",
-            "version": "1.16.0",
+            "version": "1.16.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/facade/ignition.git",
-                "reference": "37f094775814b68d0c6cc8b8ff3c3be243f20725"
+                "reference": "af05ac5ee8587395d7474ec0681c08776a2cb09d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/facade/ignition/zipball/37f094775814b68d0c6cc8b8ff3c3be243f20725",
-                "reference": "37f094775814b68d0c6cc8b8ff3c3be243f20725",
+                "url": "https://api.github.com/repos/facade/ignition/zipball/af05ac5ee8587395d7474ec0681c08776a2cb09d",
+                "reference": "af05ac5ee8587395d7474ec0681c08776a2cb09d",
                 "shasum": ""
             },
             "require": {
@@ -7346,7 +7308,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "v2.x-dev"
+                    "dev-master": "1.x-dev"
                 },
                 "laravel": {
                     "providers": [
@@ -7377,7 +7339,7 @@
                 "laravel",
                 "page"
             ],
-            "time": "2020-01-21T17:46:02+00:00"
+            "time": "2020-03-05T12:39:07+00:00"
         },
         {
             "name": "facade/ignition-contracts",
@@ -7863,16 +7825,16 @@
         },
         {
             "name": "phpspec/prophecy",
-            "version": "v1.10.2",
+            "version": "v1.10.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "b4400efc9d206e83138e2bb97ed7f5b14b831cd9"
+                "reference": "451c3cd1418cf640de218914901e51b064abb093"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/b4400efc9d206e83138e2bb97ed7f5b14b831cd9",
-                "reference": "b4400efc9d206e83138e2bb97ed7f5b14b831cd9",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/451c3cd1418cf640de218914901e51b064abb093",
+                "reference": "451c3cd1418cf640de218914901e51b064abb093",
                 "shasum": ""
             },
             "require": {
@@ -7922,7 +7884,7 @@
                 "spy",
                 "stub"
             ],
-            "time": "2020-01-20T15:57:02+00:00"
+            "time": "2020-03-05T15:02:03+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",

From c40b2b9f61be3e9108d6d6ea4dcb931fecb60f68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Thu, 12 Mar 2020 15:43:40 +0300
Subject: [PATCH 47/65] version update 2.0.4 to 2.0.5

---
 config/version.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/version.php b/config/version.php
index 823f67304..70f46900e 100644
--- a/config/version.php
+++ b/config/version.php
@@ -10,13 +10,13 @@ return [
 
     'minor'     =>  '0',
 
-    'patch'     =>  '4',
+    'patch'     =>  '5',
 
     'build'     =>  '',
 
     'status'    =>  'Stable',
 
-    'date'      =>  '04-Mar-2020',
+    'date'      =>  '12-Mar-2020',
 
     'time'      =>  '14:30',
 

From a13225047e58926031a6141b8c0c2992f52b1763 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Thu, 12 Mar 2020 16:46:25 +0300
Subject: [PATCH 48/65] fixed column issue

---
 app/Listeners/Update/V20/Version205.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Listeners/Update/V20/Version205.php b/app/Listeners/Update/V20/Version205.php
index 3c68064d4..ad6170507 100644
--- a/app/Listeners/Update/V20/Version205.php
+++ b/app/Listeners/Update/V20/Version205.php
@@ -61,7 +61,7 @@ class Version205 extends Listener
 
             DB::table('items')
                 ->where('id', $item_id)
-                ->update(['sales_price' => $invoice_item->price]);
+                ->update(['sale_price' => $invoice_item->price]);
         }
     }
 

From b0fdd2d04248e6f00ab27023fa089ec6bcd65772 Mon Sep 17 00:00:00 2001
From: batuhanbas <b1atuhanb1as@gmail.com>
Date: Fri, 13 Mar 2020 12:15:32 +0300
Subject: [PATCH 49/65] invoice template styles updated

---
 public/css/print.css                          | 64 +++++++++++++++----
 .../sales/invoices/print_default.blade.php    |  4 +-
 .../sales/invoices/print_modern.blade.php     |  9 ++-
 3 files changed, 57 insertions(+), 20 deletions(-)

diff --git a/public/css/print.css b/public/css/print.css
index 2114b3308..c5081deb7 100644
--- a/public/css/print.css
+++ b/public/css/print.css
@@ -39,6 +39,16 @@ th, td
     margin-left: 8px;
 }
 
+.mt-0
+{
+    margin-top: 0 !important;
+}
+
+.mt-1
+{
+    margin-top: 8px;
+}
+
 .mt-2
 {
     margin-top: 16px;
@@ -111,6 +121,41 @@ th, td
     padding-left: 16px;
 }
 
+.pl-3
+{
+    padding-left: 24px;
+}
+
+.pl-4
+{
+    padding-left: 32px;
+}
+
+.pl-5
+{
+    padding-left: 40px;
+}
+
+.pl-6
+{
+    padding-left: 48px;
+}
+
+.pl-7
+{
+    padding-left: 56px;
+}
+
+.pl-8
+{
+    padding-left: 64px;
+}
+
+.pl-9
+{
+    padding-left: 72px;
+}
+
 .border-1
 {
     border: 1px solid #e5e5e5;
@@ -149,7 +194,7 @@ th, td
 .text
 {
     color: #3c3f72;
-    margin-top:10px;
+    margin-top:8px;
     font-size: 13px;
 }
 
@@ -285,7 +330,7 @@ th, td
 .invoice-classic-inline-frame
 {
     margin: 0.3% 1% 0.3% 1%;
-    width: 95 !important;
+    width: 95% !important;
     height: 59px;
     border: 3px solid #3c3f72;
 }
@@ -337,21 +382,14 @@ th, td
 /*--Print Template Classic Finish--*/
 
 /*--Print Template Modern Start--*/
-.m-first-column
+.align-items-center
 {
-    padding-top: 15px;
-    padding-bottom:48px;
+    align-items: center !important;
 }
 
-.m-fc-left
+.d-flex
 {
-    padding-right: 30px;
-}
-
-.m-fc-right
-{
-    padding-left: 170px;
-     margin-top: -70px;
+    display: flex !important;
 }
 
 .m-note
diff --git a/resources/views/sales/invoices/print_default.blade.php b/resources/views/sales/invoices/print_default.blade.php
index af4d4671b..0797f1218 100644
--- a/resources/views/sales/invoices/print_default.blade.php
+++ b/resources/views/sales/invoices/print_default.blade.php
@@ -182,14 +182,14 @@
                         @stack($total->code . '_td_start')
                             <div class="border-top-1 py-2">
                                 <strong class="float-left">{{ trans($total->title) }}:</strong>
-                                <span>@money($total->amount, $invoice->currency_code, true)</span><br><br>
+                                <span>@money($total->amount, $invoice->currency_code, true)</span><br>
                             </div>
                         @stack($total->code . '_td_end')
                     @else
                         @if ($invoice->paid)
                             <div class="border-top-1 py-2">
                                 <strong class="float-left">{{ trans('invoices.paid') }}:</strong>
-                                <span>- @money($invoice->paid, $invoice->currency_code, true)</span><br><br>
+                                <span>- @money($invoice->paid, $invoice->currency_code, true)</span><br>
                             </div>
                         @endif
                         @stack('grand_total_td_start')
diff --git a/resources/views/sales/invoices/print_modern.blade.php b/resources/views/sales/invoices/print_modern.blade.php
index ddd4a0362..4c58bae8e 100644
--- a/resources/views/sales/invoices/print_modern.blade.php
+++ b/resources/views/sales/invoices/print_modern.blade.php
@@ -4,12 +4,11 @@
 
 @section('content')
     <div class="row" style="background-color:{{ setting('invoice.color') }} !important; -webkit-print-color-adjust: exact;">
-        <div class="col-58 m-first-column">
-            <div class="text company pl-2 m-fc-left">
+        <div class="col-58">
+            <div class="text company pl-2 mb-1 d-flex align-items-center">
                 <img src="{{ $logo }}" alt="{{ setting('company.name') }}"/>
-            </div>
-            <div class="text company m-fc-right">
-                <strong class="text-white">{{ setting('company.name') }}</strong>
+
+                <strong class="pl-2 text-white">{{ setting('company.name') }}</strong>
             </div>
         </div>
 

From bbdde42165627066784e51e37d913ae47ce376b9 Mon Sep 17 00:00:00 2001
From: denisdulici <denisdulici@gmail.com>
Date: Fri, 13 Mar 2020 12:44:05 +0300
Subject: [PATCH 50/65] disable model cache for recurring and reminder

---
 app/Console/Commands/BillReminder.php    | 3 +++
 app/Console/Commands/InvoiceReminder.php | 3 +++
 app/Console/Commands/RecurringCheck.php  | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/app/Console/Commands/BillReminder.php b/app/Console/Commands/BillReminder.php
index b3a3df581..b90ac320d 100644
--- a/app/Console/Commands/BillReminder.php
+++ b/app/Console/Commands/BillReminder.php
@@ -32,6 +32,9 @@ class BillReminder extends Command
      */
     public function handle()
     {
+        // Disable model cache
+        config(['laravel-model-caching.enabled' => false]);
+
         // Get all companies
         $companies = Company::enabled()->cursor();
 
diff --git a/app/Console/Commands/InvoiceReminder.php b/app/Console/Commands/InvoiceReminder.php
index 7c76f1fe0..1dff9fbc0 100644
--- a/app/Console/Commands/InvoiceReminder.php
+++ b/app/Console/Commands/InvoiceReminder.php
@@ -32,6 +32,9 @@ class InvoiceReminder extends Command
      */
     public function handle()
     {
+        // Disable model cache
+        config(['laravel-model-caching.enabled' => false]);
+
         // Get all companies
         $companies = Company::enabled()->cursor();
 
diff --git a/app/Console/Commands/RecurringCheck.php b/app/Console/Commands/RecurringCheck.php
index d5ebcc545..cf99bd0af 100644
--- a/app/Console/Commands/RecurringCheck.php
+++ b/app/Console/Commands/RecurringCheck.php
@@ -45,6 +45,9 @@ class RecurringCheck extends Command
      */
     public function handle()
     {
+        // Disable model cache
+        config(['laravel-model-caching.enabled' => false]);
+
         // Get all companies
         $companies = Company::enabled()->cursor();
 

From 1488ca4194ab01390243369ad3fcd809928fde4d Mon Sep 17 00:00:00 2001
From: batuhanbas <b1atuhanb1as@gmail.com>
Date: Fri, 13 Mar 2020 13:08:39 +0300
Subject: [PATCH 51/65] forgotten date url

---
 resources/views/purchases/payments/index.blade.php | 2 +-
 resources/views/sales/revenues/index.blade.php     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/purchases/payments/index.blade.php b/resources/views/purchases/payments/index.blade.php
index 6af3359f2..bb78adaab 100644
--- a/resources/views/purchases/payments/index.blade.php
+++ b/resources/views/purchases/payments/index.blade.php
@@ -50,7 +50,7 @@
                             <tr class="row align-items-center border-top-1">
                                 <td class="col-sm-2 col-md-2 col-lg-1 col-xl-1 d-none d-sm-block">{{ Form::bulkActionGroup($item->id, $item->contact->name) }}</td>
                                 @if ($item->reconciled)
-                                    <td class="col-xs-4 col-sm-4 col-md-3 col-lg-2 col-xl-1">@date($item->paid_at)</td>
+                                    <td class="col-xs-4 col-sm-4 col-md-3 col-lg-2 col-xl-1"><a class="col-aka" href="{{ route('payments.edit', $item->id) }}">@date($item->paid_at)</a></td>
                                 @else
                                     <td class="col-xs-4 col-sm-4 col-md-3 col-lg-2 col-xl-1"><a class="col-aka" href="{{ route('payments.edit', $item->id) }}">@date($item->paid_at)</a></td>
                                 @endif
diff --git a/resources/views/sales/revenues/index.blade.php b/resources/views/sales/revenues/index.blade.php
index 886cd3a55..1a6dddf84 100644
--- a/resources/views/sales/revenues/index.blade.php
+++ b/resources/views/sales/revenues/index.blade.php
@@ -50,7 +50,7 @@
                             <tr class="row align-items-center border-top-1">
                                 <td class="col-sm-2 col-md-2 col-lg-1 col-xl-1 d-none d-sm-block">{{ Form::bulkActionGroup($item->id, $item->contact->name) }}</td>
                                 @if ($item->reconciled)
-                                    <td class="col-xs-4 col-sm-4 col-md-3 col-lg-2 col-xl-1">@date($item->paid_at)</td>
+                                    <td class="col-xs-4 col-sm-4 col-md-3 col-lg-2 col-xl-1"><a class="col-aka" href="{{ route('revenues.edit', $item->id) }}">@date($item->paid_at)</a></td>
                                 @else
                                     <td class="col-xs-4 col-sm-4 col-md-3 col-lg-2 col-xl-1"><a class="col-aka" href="{{ route('revenues.edit', $item->id) }}">@date($item->paid_at)</a></td>
                                 @endif

From 88a3159d68c2e55fccc4d74129d614b609e2309d Mon Sep 17 00:00:00 2001
From: batuhanbas <b1atuhanb1as@gmail.com>
Date: Fri, 13 Mar 2020 14:18:17 +0300
Subject: [PATCH 52/65] extra edit link deletet

---
 resources/views/purchases/payments/index.blade.php | 2 +-
 resources/views/sales/revenues/index.blade.php     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/purchases/payments/index.blade.php b/resources/views/purchases/payments/index.blade.php
index bb78adaab..d9fc743cc 100644
--- a/resources/views/purchases/payments/index.blade.php
+++ b/resources/views/purchases/payments/index.blade.php
@@ -50,7 +50,7 @@
                             <tr class="row align-items-center border-top-1">
                                 <td class="col-sm-2 col-md-2 col-lg-1 col-xl-1 d-none d-sm-block">{{ Form::bulkActionGroup($item->id, $item->contact->name) }}</td>
                                 @if ($item->reconciled)
-                                    <td class="col-xs-4 col-sm-4 col-md-3 col-lg-2 col-xl-1"><a class="col-aka" href="{{ route('payments.edit', $item->id) }}">@date($item->paid_at)</a></td>
+                                    <td class="col-xs-4 col-sm-4 col-md-3 col-lg-2 col-xl-1"><a class="col-aka" href="#">@date($item->paid_at)</a></td>
                                 @else
                                     <td class="col-xs-4 col-sm-4 col-md-3 col-lg-2 col-xl-1"><a class="col-aka" href="{{ route('payments.edit', $item->id) }}">@date($item->paid_at)</a></td>
                                 @endif
diff --git a/resources/views/sales/revenues/index.blade.php b/resources/views/sales/revenues/index.blade.php
index 1a6dddf84..9fb2e7aff 100644
--- a/resources/views/sales/revenues/index.blade.php
+++ b/resources/views/sales/revenues/index.blade.php
@@ -50,7 +50,7 @@
                             <tr class="row align-items-center border-top-1">
                                 <td class="col-sm-2 col-md-2 col-lg-1 col-xl-1 d-none d-sm-block">{{ Form::bulkActionGroup($item->id, $item->contact->name) }}</td>
                                 @if ($item->reconciled)
-                                    <td class="col-xs-4 col-sm-4 col-md-3 col-lg-2 col-xl-1"><a class="col-aka" href="{{ route('revenues.edit', $item->id) }}">@date($item->paid_at)</a></td>
+                                    <td class="col-xs-4 col-sm-4 col-md-3 col-lg-2 col-xl-1"><a class="col-aka" href="#">@date($item->paid_at)</a></td>
                                 @else
                                     <td class="col-xs-4 col-sm-4 col-md-3 col-lg-2 col-xl-1"><a class="col-aka" href="{{ route('revenues.edit', $item->id) }}">@date($item->paid_at)</a></td>
                                 @endif

From d46e6c44aca9813501c26254d8f6080f21339223 Mon Sep 17 00:00:00 2001
From: denisdulici <denisdulici@gmail.com>
Date: Fri, 13 Mar 2020 14:55:50 +0300
Subject: [PATCH 53/65] prevent change/delete for reconciled records

---
 app/Jobs/Banking/DeleteTransaction.php |  6 ++++++
 app/Jobs/Banking/UpdateTransaction.php | 16 ++++++++++++++++
 app/Jobs/Purchase/DeleteBill.php       | 16 ++++++++++++++++
 app/Jobs/Sale/DeleteInvoice.php        | 16 ++++++++++++++++
 app/Models/Banking/Transaction.php     | 22 ++++++++++++++++++++++
 resources/lang/en-GB/messages.php      |  2 ++
 6 files changed, 78 insertions(+)

diff --git a/app/Jobs/Banking/DeleteTransaction.php b/app/Jobs/Banking/DeleteTransaction.php
index 91908b481..1b7895d13 100644
--- a/app/Jobs/Banking/DeleteTransaction.php
+++ b/app/Jobs/Banking/DeleteTransaction.php
@@ -41,6 +41,12 @@ class DeleteTransaction extends Job
      */
     public function authorize()
     {
+        if ($this->transaction->reconciled) {
+            $message = trans('messages.warning.reconciled_tran');
+
+            throw new \Exception($message);
+        }
+
         if ($this->transaction->category->id == Category::transfer()) {
             throw new \Exception('Unauthorized');
         }
diff --git a/app/Jobs/Banking/UpdateTransaction.php b/app/Jobs/Banking/UpdateTransaction.php
index 4b9d7824a..131a16320 100644
--- a/app/Jobs/Banking/UpdateTransaction.php
+++ b/app/Jobs/Banking/UpdateTransaction.php
@@ -30,6 +30,8 @@ class UpdateTransaction extends Job
      */
     public function handle()
     {
+        $this->authorize();
+
         $this->transaction->update($this->request->all());
 
         // Upload attachment
@@ -44,4 +46,18 @@ class UpdateTransaction extends Job
 
         return $this->transaction;
     }
+
+    /**
+     * Determine if this action is applicable.
+     *
+     * @return void
+     */
+    public function authorize()
+    {
+        if ($this->transaction->reconciled) {
+            $message = trans('messages.warning.reconciled_tran');
+
+            throw new \Exception($message);
+        }
+    }
 }
diff --git a/app/Jobs/Purchase/DeleteBill.php b/app/Jobs/Purchase/DeleteBill.php
index f90048303..7822fd302 100644
--- a/app/Jobs/Purchase/DeleteBill.php
+++ b/app/Jobs/Purchase/DeleteBill.php
@@ -27,6 +27,8 @@ class DeleteBill extends Job
      */
     public function handle()
     {
+        $this->authorize();
+
         Transaction::mute();
 
         $this->deleteRelationships($this->bill, [
@@ -39,4 +41,18 @@ class DeleteBill extends Job
 
         return true;
     }
+
+    /**
+     * Determine if this action is applicable.
+     *
+     * @return void
+     */
+    public function authorize()
+    {
+        if ($this->bill->transactions()->isReconciled()->count()) {
+            $message = trans('messages.warning.reconciled_doc', ['type' => trans_choice('general.bills', 1)]);
+
+            throw new \Exception($message);
+        }
+    }
 }
diff --git a/app/Jobs/Sale/DeleteInvoice.php b/app/Jobs/Sale/DeleteInvoice.php
index decf06677..ff0ad5de7 100644
--- a/app/Jobs/Sale/DeleteInvoice.php
+++ b/app/Jobs/Sale/DeleteInvoice.php
@@ -27,6 +27,8 @@ class DeleteInvoice extends Job
      */
     public function handle()
     {
+        $this->authorize();
+
         Transaction::mute();
 
         $this->deleteRelationships($this->invoice, [
@@ -39,4 +41,18 @@ class DeleteInvoice extends Job
 
         return true;
     }
+
+    /**
+     * Determine if this action is applicable.
+     *
+     * @return void
+     */
+    public function authorize()
+    {
+        if ($this->invoice->transactions()->isReconciled()->count()) {
+            $message = trans('messages.warning.reconciled_doc', ['type' => trans_choice('general.invoices', 1)]);
+
+            throw new \Exception($message);
+        }
+    }
 }
diff --git a/app/Models/Banking/Transaction.php b/app/Models/Banking/Transaction.php
index c33afb47c..6f85c8255 100644
--- a/app/Models/Banking/Transaction.php
+++ b/app/Models/Banking/Transaction.php
@@ -174,6 +174,28 @@ class Transaction extends Model
         return $query->sum('amount');
     }
 
+    /**
+     * Get only reconciled.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeIsReconciled($query)
+    {
+        return $query->where('reconciled', 1);
+    }
+
+    /**
+     * Get only not reconciled.
+     *
+     * @param \Illuminate\Database\Eloquent\Builder $query
+     * @return \Illuminate\Database\Eloquent\Builder
+     */
+    public function scopeIsNotReconciled($query)
+    {
+        return $query->where('reconciled', 0);
+    }
+
     /**
      * Convert amount to double.
      *
diff --git a/resources/lang/en-GB/messages.php b/resources/lang/en-GB/messages.php
index 815a9518e..e14d19be0 100644
--- a/resources/lang/en-GB/messages.php
+++ b/resources/lang/en-GB/messages.php
@@ -28,6 +28,8 @@ return [
     'warning' => [
         'deleted'           => 'Warning: You are not allowed to delete <b>:name</b> because it has :text related.',
         'disabled'          => 'Warning: You are not allowed to disable <b>:name</b> because it has :text related.',
+        'reconciled_tran'   => 'Warning: You are not allowed to change/delete transaction because it is reconciled!',
+        'reconciled_doc'    => 'Warning: You are not allowed to change/delete :type because it has reconciled transactions!',
         'disable_code'      => 'Warning: You are not allowed to disable or change the currency of <b>:name</b> because it has :text related.',
         'payment_cancel'    => 'Warning: You have cancelled your recent :method payment!',
     ],

From 7c027ad13545ec918bece274960a59fdaf148504 Mon Sep 17 00:00:00 2001
From: denisdulici <denisdulici@gmail.com>
Date: Fri, 13 Mar 2020 14:58:45 +0300
Subject: [PATCH 54/65] fixed labeler ci

---
 .github/workflows/labeler.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/labeler.yml b/.github/workflows/labeler.yml
index f15332cac..2ce733d7b 100644
--- a/.github/workflows/labeler.yml
+++ b/.github/workflows/labeler.yml
@@ -13,5 +13,5 @@ jobs:
     - uses: actions/labeler@v2
       with:
         repo-token: "${{ secrets.GITHUB_TOKEN }}"
-      Language Change:
+      "Language Change":
         - resources/lang/en-GB/*

From 0f34bd066fe06f4405bb7a70d96e278a63380744 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Fri, 13 Mar 2020 15:45:23 +0300
Subject: [PATCH 55/65] close #1353 Fixed: Invoice item selected tax not
 calculate real time

---
 .../assets/js/components/AkauntingSelect.vue  | 28 +++++++++++++------
 .../js/components/AkauntingSelectRemote.vue   | 24 +++++++++-------
 .../views/purchases/bills/item.blade.php      |  5 ++--
 resources/views/sales/invoices/item.blade.php |  5 ++--
 4 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/resources/assets/js/components/AkauntingSelect.vue b/resources/assets/js/components/AkauntingSelect.vue
index 21bb91cda..0ac043bd8 100644
--- a/resources/assets/js/components/AkauntingSelect.vue
+++ b/resources/assets/js/components/AkauntingSelect.vue
@@ -74,7 +74,7 @@
                 </el-option>
             </el-option-group>
 
-            <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :value="add_new">
+            <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :disabled="true"  :value="add_new">
                 <div @click="onAddItem">
                     <i class="fas fa-plus"></i>
                     <span>
@@ -147,7 +147,7 @@
                 </el-option>
             </el-option-group>
 
-            <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :value="add_new">
+            <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :disabled="true" :value="add_new">
                 <div @click="onAddItem">
                     <i class="fas fa-plus"></i>
                     <span>
@@ -220,7 +220,7 @@
                 </el-option>
             </el-option-group>
 
-            <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :value="add_new">
+            <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :disabled="true" :value="add_new">
                 <div @click="onAddItem">
                     <i class="fas fa-plus"></i>
                     <span>
@@ -293,7 +293,7 @@
                 </el-option>
             </el-option-group>
 
-            <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :value="add_new">
+            <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :disabled="true" :value="add_new">
                 <div @click="onAddItem">
                     <i class="fas fa-plus"></i>
                     <span>
@@ -366,7 +366,7 @@
                 </el-option>
             </el-option-group>
 
-            <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :value="add_new">
+            <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :disabled="true" :value="add_new">
                 <div @click="onAddItem">
                     <i class="fas fa-plus"></i>
                     <span>
@@ -549,12 +549,12 @@ export default {
 
     methods: {
         change() {
-            if (typeof(this.real_model) === 'object') {
+            if (typeof(this.real_model) === 'object' && typeof(this.real_model.type) !== 'undefined') {
                 return false;
             }
 
-            this.$emit('change', this.real_model);
             this.$emit('interface', this.real_model);
+            this.$emit('change', this.real_model);
         },
 
         async onAddItem() {
@@ -679,6 +679,10 @@ export default {
                 this.form.loading = false;
 
                 if (response.data.success) {
+                    if (!this.selectOptions.length) {
+                        this.selectOptions =  {};
+                    }
+
                     this.selectOptions[response.data.data[this.add_new.field.key]] = response.data.data[this.add_new.field.value];
                     this.new_options[response.data.data[this.add_new.field.key]] = response.data.data[this.add_new.field.value];
 
@@ -688,8 +692,6 @@ export default {
                         this.real_model = response.data.data[this.add_new.field.key].toString();
                     }
 
-                    this.change();
-
                     this.add_new.show = false;
 
                     this.add_new.html = '';
@@ -698,6 +700,10 @@ export default {
                     if (this.multiple) {
                         this.hide_selected = false;
                     }
+
+                    this.$emit('new', response.data.data);
+
+                    this.change();
                 }
             })
             .catch(error => {
@@ -726,6 +732,10 @@ export default {
             this.selectOptions = options;
 
             if (Object.keys(this.new_options).length) {
+                if (!this.selectOptions.length) {
+                    this.selectOptions =  {};
+                }
+
                 for (let [key, value] of Object.entries(this.new_options)) {
                     if (!this.selectOptions[key]) {
                         this.selectOptions[key] = value;
diff --git a/resources/assets/js/components/AkauntingSelectRemote.vue b/resources/assets/js/components/AkauntingSelectRemote.vue
index 621c09c1d..b9a78ed04 100644
--- a/resources/assets/js/components/AkauntingSelectRemote.vue
+++ b/resources/assets/js/components/AkauntingSelectRemote.vue
@@ -74,7 +74,7 @@
                 </el-option>
             </el-option-group>
 
-            <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :value="add_new">
+            <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :disabled="true" :value="add_new">
                 <div @click="onAddItem">
                     <i class="fas fa-plus"></i>
                     <span>
@@ -147,7 +147,7 @@
                 </el-option>
             </el-option-group>
 
-            <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :value="add_new">
+            <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :disabled="true" :value="add_new">
                 <div @click="onAddItem">
                     <i class="fas fa-plus"></i>
                     <span>
@@ -220,7 +220,7 @@
                 </el-option>
             </el-option-group>
 
-            <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :value="add_new">
+            <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :disabled="true" :value="add_new">
                 <div @click="onAddItem">
                     <i class="fas fa-plus"></i>
                     <span>
@@ -293,7 +293,7 @@
                 </el-option>
             </el-option-group>
 
-            <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :value="add_new">
+            <el-option v-if="addNew.status && options.length != 0" class="el-select__footer" :disabled="true" :value="add_new">
                 <div @click="onAddItem">
                     <i class="fas fa-plus"></i>
                     <span>
@@ -390,7 +390,7 @@
                     </el-option>
                 </el-option-group>
 
-                <el-option v-if="!loading && addNew.status && selectOptions != null && selectOptions.length != 0" class="el-select__footer" :value="add_new">
+                <el-option v-if="!loading && addNew.status && selectOptions != null && selectOptions.length != 0" class="el-select__footer" :disabled="true" :value="add_new">
                     <div @click="onAddItem">
                         <i class="fas fa-plus"></i>
                         <span>
@@ -634,8 +634,8 @@ export default {
                 return false;
             }
 
-            this.$emit('change', this.real_model);
             this.$emit('interface', this.real_model);
+            this.$emit('change', this.real_model);
 
             this.selectOptions.forEach(item => {
                 if (item.id == this.real_model) {
@@ -687,13 +687,15 @@ export default {
                     this.new_options[response.data.data[this.add_new.field.key]] = response.data.data;
                     this.real_model = response.data.data[this.add_new.field.key];
 
-                    this.change();
-
                     if (this.title) {
                         this.$children[0].$children[0].visible = false;
                     } else {
                         this.$children[0].visible = false;
                     }
+
+                    this.$emit('new', response.data.data);
+
+                    this.change();
                 }
             })
             .catch(error => {
@@ -804,12 +806,14 @@ export default {
                     this.new_options[response.data.data[this.add_new.field.key]] = response.data.data[this.add_new.field.value];
                     this.real_model = response.data.data[this.add_new.field.key];//.toString();
 
-                    this.change();
-
                     this.add_new.show = false;
 
                     this.add_new.html = '';
                     this.add_new_html = null;
+
+                    this.$emit('new', response.data.data);
+
+                    this.change();
                 }
             })
             .catch(error => {
diff --git a/resources/views/purchases/bills/item.blade.php b/resources/views/purchases/bills/item.blade.php
index 85eabcbdd..1dd723617 100644
--- a/resources/views/purchases/bills/item.blade.php
+++ b/resources/views/purchases/bills/item.blade.php
@@ -133,9 +133,10 @@
                         ]
                     ]
                 ])}}"
-                :collapse="false"
+                :collapse="true"
                 @interface="row.tax_id = $event"
-                @change="onCalculateTotal($event)"
+                @change="onCalculateTotal()"
+                @new="taxes.push($event)"
                 :form-error="form.errors.get('items.' + index + '.tax_id')"
                 :no-data-text="'{{ trans('general.no_data') }}'"
                 :no-matching-data-text="'{{ trans('general.no_matching_data') }}'"
diff --git a/resources/views/sales/invoices/item.blade.php b/resources/views/sales/invoices/item.blade.php
index 127b7834e..3c4ef14c8 100644
--- a/resources/views/sales/invoices/item.blade.php
+++ b/resources/views/sales/invoices/item.blade.php
@@ -133,9 +133,10 @@
                         ]
                     ]
                 ])}}"
-                :collapse="false"
+                :collapse="true"
                 @interface="row.tax_id = $event"
-                @change="onCalculateTotal($event)"
+                @change="onCalculateTotal()"
+                @new="taxes.push($event)"
                 :form-error="form.errors.get('items.' + index + '.tax_id')"
                 :no-data-text="'{{ trans('general.no_data') }}'"
                 :no-matching-data-text="'{{ trans('general.no_matching_data') }}'"

From 0f8fda0a3cea1456767558d42e70999566ca18e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Fri, 13 Mar 2020 16:40:47 +0300
Subject: [PATCH 56/65] composer.lock file update..

---
 composer.lock | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/composer.lock b/composer.lock
index 86ccdc6c0..7cdb2668c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1131,16 +1131,16 @@
         },
         {
             "name": "dingo/api",
-            "version": "v2.4.5",
+            "version": "v2.4.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/dingo/api.git",
-                "reference": "05299b02e98c2833fed7fee8ce223b4ba8d2b2d4"
+                "reference": "1ff4d3ae4354854e40a63f231f142aa1b06317cb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/dingo/api/zipball/05299b02e98c2833fed7fee8ce223b4ba8d2b2d4",
-                "reference": "05299b02e98c2833fed7fee8ce223b4ba8d2b2d4",
+                "url": "https://api.github.com/repos/dingo/api/zipball/1ff4d3ae4354854e40a63f231f142aa1b06317cb",
+                "reference": "1ff4d3ae4354854e40a63f231f142aa1b06317cb",
                 "shasum": ""
             },
             "require": {
@@ -1209,7 +1209,7 @@
                 "laravel",
                 "restful"
             ],
-            "time": "2020-01-06T12:31:51+00:00"
+            "time": "2020-03-12T13:07:21+00:00"
         },
         {
             "name": "dingo/blueprint",
@@ -6994,16 +6994,16 @@
         },
         {
             "name": "vlucas/phpdotenv",
-            "version": "v3.6.0",
+            "version": "v3.6.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/vlucas/phpdotenv.git",
-                "reference": "1bdf24f065975594f6a117f0f1f6cabf1333b156"
+                "reference": "8f7961f7b9deb3b432452c18093cf16f88205902"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/1bdf24f065975594f6a117f0f1f6cabf1333b156",
-                "reference": "1bdf24f065975594f6a117f0f1f6cabf1333b156",
+                "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/8f7961f7b9deb3b432452c18093cf16f88205902",
+                "reference": "8f7961f7b9deb3b432452c18093cf16f88205902",
                 "shasum": ""
             },
             "require": {
@@ -7012,8 +7012,12 @@
                 "symfony/polyfill-ctype": "^1.9"
             },
             "require-dev": {
+                "ext-filter": "*",
                 "phpunit/phpunit": "^4.8.35 || ^5.0 || ^6.0 || ^7.0"
             },
+            "suggest": {
+                "ext-filter": "Required to use the boolean validator."
+            },
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -7047,7 +7051,7 @@
                 "env",
                 "environment"
             ],
-            "time": "2019-09-10T21:37:39+00:00"
+            "time": "2020-03-12T13:44:00+00:00"
         },
         {
             "name": "webmozart/assert",

From 1b244daf71f3be030ecf0d9943140664f355bf49 Mon Sep 17 00:00:00 2001
From: batuhanbas <b1atuhanb1as@gmail.com>
Date: Fri, 13 Mar 2020 16:46:25 +0300
Subject: [PATCH 57/65] dashboard date picker responsive updated

---
 public/css/custom.css  | 15 +----------
 public/css/element.css | 59 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+), 14 deletions(-)

diff --git a/public/css/custom.css b/public/css/custom.css
index 62dbd3de2..de7a60b65 100644
--- a/public/css/custom.css
+++ b/public/css/custom.css
@@ -859,10 +859,7 @@ table .align-items-center td span.badge
 /*--Sm Breakpoint--*/
 @media (min-width: 576px) and (max-width: 767.98px)
 {
-    .dashboard-action
-    {
-        margin-left: 4rem !important;
-    }
+
 }
 /*--Sm Breakpoint Finish--*/
 
@@ -873,11 +870,6 @@ table .align-items-center td span.badge
     {
         left: 1rem !important;
     }
-
-    .dashboard-action
-    {
-        margin-left: 3rem !important;
-    }
 }
 /*--Md Breakpoint Finish--*/
 
@@ -888,11 +880,6 @@ table .align-items-center td span.badge
     {
         left: 1rem;
     }
-
-    .dashboard-action
-    {
-        margin-left: 1rem !important;
-    }
 }
 /*--Lg Breakpoint Finish--*/
 /*--------Responsive Finish--------*/
diff --git a/public/css/element.css b/public/css/element.css
index d8f740aac..6e5a12087 100644
--- a/public/css/element.css
+++ b/public/css/element.css
@@ -15664,3 +15664,62 @@
     color: #3c3f72 !important;
 }
 /*--------El Select Finish--------*/
+
+@media (max-width: 575.98px)
+{
+   /*--Date Time Picker--*/
+   .el-date-range-picker.has-sidebar
+   {
+       width: 99% !important;
+   }
+
+   .el-picker-panel__shortcut
+   {
+       text-align: center !important;
+   }
+
+   .el-picker-panel__body-wrapper
+   {
+       flex-flow: column !important;
+   }
+
+   .el-picker-panel__sidebar
+   {
+       position:unset !important;
+       width: 100% !important;
+       border-right:none !important;
+   }
+
+   .el-picker-panel__body
+   {
+       position: unset !important;
+       display: flex !important;
+       flex-flow: column !important;
+   }
+
+   .el-picker-panel__sidebar+.el-picker-panel__body
+   {
+       margin-left: 0 !important;
+   }
+
+   .el-date-range-picker .el-picker-panel__body
+   {
+       min-width: 100% !important;
+   }
+
+   .el-date-range-picker .el-picker-panel__content
+   {
+       margin: 0 !important;
+   }
+
+   .el-date-range-picker__content
+   {
+       width: 100% !important;
+   }
+
+   .el-date-range-picker__content.is-left
+   {
+       border-right: none !important;
+   }
+/*--Date Time Picker Finish--*/
+}

From 56d63b118568a8f6a75f177af7d840aed3dffde4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Fri, 13 Mar 2020 18:08:49 +0300
Subject: [PATCH 58/65] Select vue file update..

---
 .../assets/js/components/AkauntingSelect.vue  | 26 +++++--------------
 .../js/components/AkauntingSelectRemote.vue   | 17 +++++++++++-
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/resources/assets/js/components/AkauntingSelect.vue b/resources/assets/js/components/AkauntingSelect.vue
index 0ac043bd8..7ea02ce16 100644
--- a/resources/assets/js/components/AkauntingSelect.vue
+++ b/resources/assets/js/components/AkauntingSelect.vue
@@ -533,7 +533,6 @@ export default {
             add_new_html: '',
             form: {},
             new_options: false,
-            hide_selected: false,
         }
     },
 
@@ -544,6 +543,10 @@ export default {
     mounted() {
         this.real_model = this.value;
 
+        if (this.multiple && !this.real_model.length) {
+            this.real_model = [];
+        }
+
         this.$emit('interface', this.real_model);
     },
 
@@ -558,10 +561,6 @@ export default {
         },
 
         async onAddItem() {
-            if (this.multiple) {
-                this.hide_selected = this.real_model;
-            }
-
             // Get Select Input value
             if (this.title) {
                 var value = this.$children[0].$children[0].$children[0].$refs.input.value;
@@ -581,9 +580,6 @@ export default {
         },
 
         addInline(value) {
-            if (this.multiple) {
-                this.hide_selected = false;
-            }
         },
 
         onModal(value) {
@@ -679,7 +675,7 @@ export default {
                 this.form.loading = false;
 
                 if (response.data.success) {
-                    if (!this.selectOptions.length) {
+                    if (!Object.keys(this.options).length) {
                         this.selectOptions =  {};
                     }
 
@@ -697,10 +693,6 @@ export default {
                     this.add_new.html = '';
                     this.add_new_html = null;
 
-                    if (this.multiple) {
-                        this.hide_selected = false;
-                    }
-
                     this.$emit('new', response.data.data);
 
                     this.change();
@@ -732,7 +724,7 @@ export default {
             this.selectOptions = options;
 
             if (Object.keys(this.new_options).length) {
-                if (!this.selectOptions.length) {
+                if (!Object.keys(this.options).length) {
                     this.selectOptions =  {};
                 }
 
@@ -744,12 +736,6 @@ export default {
             }
         },
 
-        real_model: function (value) {
-            if (this.multiple && this.hide_selected) {
-                this.real_model = this.hide_selected;
-            }
-        },
-
         value: function (value) {
             if (this.multiple) {
                 this.real_model = value;
diff --git a/resources/assets/js/components/AkauntingSelectRemote.vue b/resources/assets/js/components/AkauntingSelectRemote.vue
index b9a78ed04..950f10a18 100644
--- a/resources/assets/js/components/AkauntingSelectRemote.vue
+++ b/resources/assets/js/components/AkauntingSelectRemote.vue
@@ -584,6 +584,10 @@ export default {
     mounted() {
         this.real_model = this.value;
 
+        if (this.multiple && !this.real_model.length) {
+            this.real_model = [];
+        }
+
         this.$emit('interface', this.real_model);
     },
 
@@ -683,6 +687,10 @@ export default {
             })
             .then(response => {
                 if (response.data.success) {
+                    if (!Object.keys(this.options).length) {
+                        this.selectOptions =  {};
+                    }
+
                     this.selectOptions.push(response.data.data);
                     this.new_options[response.data.data[this.add_new.field.key]] = response.data.data;
                     this.real_model = response.data.data[this.add_new.field.key];
@@ -800,7 +808,10 @@ export default {
                 this.form.loading = false;
 
                 if (response.data.success) {
-                    
+                    if (!Object.keys(this.options).length) {
+                        this.selectOptions =  {};
+                    }
+
                     this.selectOptions.push(response.data.data);
                     //this.selectOptions[response.data.data[this.add_new.field.key]] = response.data.data[this.add_new.field.value];
                     this.new_options[response.data.data[this.add_new.field.key]] = response.data.data[this.add_new.field.value];
@@ -842,6 +853,10 @@ export default {
             this.selectOptions = options;
 
             if (Object.keys(this.new_options).length) {
+                if (!Object.keys(this.options).length) {
+                    this.selectOptions =  {};
+                }
+
                 Object.values(this.new_options).forEach(item => {
                     this.selectOptions.push(item);
                 });

From 69d59214d0f7f52321d2a67a415fa862d0c67cd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Fri, 13 Mar 2020 18:42:26 +0300
Subject: [PATCH 59/65] version update 2.0.5 to 2.0.6

---
 config/version.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/version.php b/config/version.php
index 70f46900e..ab97bff10 100644
--- a/config/version.php
+++ b/config/version.php
@@ -10,15 +10,15 @@ return [
 
     'minor'     =>  '0',
 
-    'patch'     =>  '5',
+    'patch'     =>  '6',
 
     'build'     =>  '',
 
     'status'    =>  'Stable',
 
-    'date'      =>  '12-Mar-2020',
+    'date'      =>  '13-Mar-2020',
 
-    'time'      =>  '14:30',
+    'time'      =>  '18:30',
 
     'zone'      =>  'GMT +3',
 

From f5b7cb3f218affe8f6b0f308e8802d4f7569a02f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Sat, 14 Mar 2020 10:44:39 +0300
Subject: [PATCH 60/65] Select remote file updates..

---
 resources/assets/js/components/AkauntingSelectRemote.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/assets/js/components/AkauntingSelectRemote.vue b/resources/assets/js/components/AkauntingSelectRemote.vue
index 950f10a18..c0a11c4fc 100644
--- a/resources/assets/js/components/AkauntingSelectRemote.vue
+++ b/resources/assets/js/components/AkauntingSelectRemote.vue
@@ -688,7 +688,7 @@ export default {
             .then(response => {
                 if (response.data.success) {
                     if (!Object.keys(this.options).length) {
-                        this.selectOptions =  {};
+                        this.selectOptions =  [];
                     }
 
                     this.selectOptions.push(response.data.data);
@@ -809,7 +809,7 @@ export default {
 
                 if (response.data.success) {
                     if (!Object.keys(this.options).length) {
-                        this.selectOptions =  {};
+                        this.selectOptions =  [];
                     }
 
                     this.selectOptions.push(response.data.data);
@@ -854,7 +854,7 @@ export default {
 
             if (Object.keys(this.new_options).length) {
                 if (!Object.keys(this.options).length) {
-                    this.selectOptions =  {};
+                    this.selectOptions =  [];
                 }
 
                 Object.values(this.new_options).forEach(item => {

From 9f9d2900604e3a40f691ad1a41fb44384ca80162 Mon Sep 17 00:00:00 2001
From: denisdulici <denisdulici@gmail.com>
Date: Sat, 14 Mar 2020 11:59:10 +0300
Subject: [PATCH 61/65] fixed title in bulk action modal

---
 resources/views/partials/form/bulk_action_row_group.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/partials/form/bulk_action_row_group.blade.php b/resources/views/partials/form/bulk_action_row_group.blade.php
index 73d6ba66c..55d77160c 100644
--- a/resources/views/partials/form/bulk_action_row_group.blade.php
+++ b/resources/views/partials/form/bulk_action_row_group.blade.php
@@ -82,7 +82,7 @@
 
 <akaunting-modal
     :show="bulk_action.modal"
-    :title="'{{ trans_choice('general.items', 2) }}'"
+    :title="'{{ trans_choice($text, 2) }}'"
     :message="bulk_action.message"
     @cancel="onCancel"
     v-if='bulk_action.message && bulk_action.modal'>

From 55b1b6947feb61d5a9cc89aa9a8ca55f0126c8cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Sat, 14 Mar 2020 16:14:57 +0300
Subject: [PATCH 62/65] Module item show page language issue solved.

---
 resources/views/modules/item/show.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/modules/item/show.blade.php b/resources/views/modules/item/show.blade.php
index 8a9f4ba95..e1a009b1b 100644
--- a/resources/views/modules/item/show.blade.php
+++ b/resources/views/modules/item/show.blade.php
@@ -257,7 +257,7 @@
 
     @if ($module->install)
         <akaunting-modal :show="installation.show"
-        :title="'{{ trans('modules.installation.header') }}'"
+        title="{{ trans('modules.installation.header') }}"
         @cancel="installation.show = false">
             <template #modal-body>
                 <div class="modal-body">

From 83f6d5f9ddd7bb315ce03360739dd499f3811293 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Sat, 14 Mar 2020 16:15:29 +0300
Subject: [PATCH 63/65] view file updates..

---
 resources/views/auth/forgot/create.blade.php  |   1 +
 resources/views/auth/login/create.blade.php   |   1 +
 .../views/auth/permissions/index.blade.php    |   2 +-
 resources/views/modules/home/index.blade.php  | 100 +++++++++---------
 .../views/modules/item/pre_sale.blade.php     |   4 +-
 resources/views/modules/my/index.blade.php    |   2 +
 resources/views/modules/tiles/index.blade.php |  53 +++++-----
 7 files changed, 86 insertions(+), 77 deletions(-)

diff --git a/resources/views/auth/forgot/create.blade.php b/resources/views/auth/forgot/create.blade.php
index 7d07f4905..044762450 100644
--- a/resources/views/auth/forgot/create.blade.php
+++ b/resources/views/auth/forgot/create.blade.php
@@ -7,6 +7,7 @@
 @section('content')
     <div role="alert" class="alert alert-success d-none" :class="(form.response.success) ? 'show' : ''" v-if="form.response.success" v-html="form.response.message"></div>
     <div role="alert" class="alert alert-danger d-none" :class="(form.response.error) ? 'show' : ''" v-if="form.response.error" v-html="form.response.message"></div>
+
     {!! Form::open([
         'route' => 'forgot',
         'id' => 'forgot',
diff --git a/resources/views/auth/login/create.blade.php b/resources/views/auth/login/create.blade.php
index aef27a2db..f7e669797 100644
--- a/resources/views/auth/login/create.blade.php
+++ b/resources/views/auth/login/create.blade.php
@@ -6,6 +6,7 @@
 
 @section('content')
     <div role="alert" class="alert alert-danger d-none" :class="(form.response.error) ? 'show' : ''" v-if="form.response.error" v-html="form.response.message"></div>
+
     {!! Form::open([
         'route' => 'login',
         'id' => 'login',
diff --git a/resources/views/auth/permissions/index.blade.php b/resources/views/auth/permissions/index.blade.php
index bf8f3c97a..706f7ed4e 100644
--- a/resources/views/auth/permissions/index.blade.php
+++ b/resources/views/auth/permissions/index.blade.php
@@ -2,7 +2,7 @@
 
 @section('title', trans_choice('general.permissions', 2))
 
-@permission('update-auth-permissions')
+@permission('create-auth-permissions')
     @section('new_button')
         <a href="{{ route('permissions.create') }}" class="btn btn-success btn-sm header-button-top"><span class="fa fa-plus"></span> &nbsp;{{ trans('general.add_new') }}</a>
     @endsection
diff --git a/resources/views/modules/home/index.blade.php b/resources/views/modules/home/index.blade.php
index 46eef2113..a0dc1c0fe 100644
--- a/resources/views/modules/home/index.blade.php
+++ b/resources/views/modules/home/index.blade.php
@@ -10,57 +10,61 @@
 @section('content')
     @include('partials.modules.bar')
 
-        @if ($pre_sale)
-            <h2>{{ trans('modules.pre_sale') }}</h2>
-            <div class="row">
-                @if ($pre_sale->data)
-                    @foreach ($pre_sale->data as $module)
-                        @include('partials.modules.pre_sale')
-                    @endforeach
-                @else
-                    @include('partials.modules.no_apps')
-                @endif
-            </div>
-        @endif
+    @if ($pre_sale)
+        <h2>{{ trans('modules.pre_sale') }}</h2>
 
-        @if ($paid)
-            <h2>{{ trans('modules.top_paid') }}</h2>
-            <div class="row">
-                @if ($paid->data)
-                    @foreach ($paid->data as $module)
-                        @include('partials.modules.item')
-                    @endforeach
-                @else
-                    @include('partials.modules.no_apps')
-                @endif
-            </div>
-        @endif
+        <div class="row">
+            @if ($pre_sale->data)
+                @foreach ($pre_sale->data as $module)
+                    @include('partials.modules.pre_sale')
+                @endforeach
+            @else
+                @include('partials.modules.no_apps')
+            @endif
+        </div>
+    @endif
 
-        @if ($new)
-            <h2>{{ trans('modules.new') }}</h2>
-            <div class="row">
-                @if ($new->data)
-                    @foreach ($new->data as $module)
-                        @include('partials.modules.item')
-                    @endforeach
-                @else
-                    @include('partials.modules.no_apps')
-                @endif
-            </div>
-        @endif
+    @if ($paid)
+        <h2>{{ trans('modules.top_paid') }}</h2>
 
-        @if ($free)
-            <h2>{{ trans('modules.top_free') }}</h2>
-            <div class="row">
-                @if ($free->data)
-                    @foreach ($free->data as $module)
-                        @include('partials.modules.item')
-                    @endforeach
-                @else
-                    @include('partials.modules.no_apps')
-                @endif
-            </div>
-        @endif
+        <div class="row">
+            @if ($paid->data)
+                @foreach ($paid->data as $module)
+                    @include('partials.modules.item')
+                @endforeach
+            @else
+                @include('partials.modules.no_apps')
+            @endif
+        </div>
+    @endif
+
+    @if ($new)
+        <h2>{{ trans('modules.new') }}</h2>
+
+        <div class="row">
+            @if ($new->data)
+                @foreach ($new->data as $module)
+                    @include('partials.modules.item')
+                @endforeach
+            @else
+                @include('partials.modules.no_apps')
+            @endif
+        </div>
+    @endif
+
+    @if ($free)
+        <h2>{{ trans('modules.top_free') }}</h2>
+
+        <div class="row">
+            @if ($free->data)
+                @foreach ($free->data as $module)
+                    @include('partials.modules.item')
+                @endforeach
+            @else
+                @include('partials.modules.no_apps')
+            @endif
+        </div>
+    @endif
 @endsection
 
 @push('scripts_start')
diff --git a/resources/views/modules/item/pre_sale.blade.php b/resources/views/modules/item/pre_sale.blade.php
index 8c23e2050..b41da218d 100644
--- a/resources/views/modules/item/pre_sale.blade.php
+++ b/resources/views/modules/item/pre_sale.blade.php
@@ -13,6 +13,7 @@
     <div class="row">
         <div class="col-md-8">
             <h3>{{ $module->name }}</h3>
+
             <div class="nav-wrapper">
                 <ul class="nav nav-pills nav-fill flex-column flex-md-row" id="tabs-icons-text" role="tablist">
                     <li class="nav-item">
@@ -49,6 +50,7 @@
 
         <div class="col-md-4">
             <h3>{{ trans_choice('general.actions', 1) }}</h3>
+
             <div class="card">
                 <div class="card-body">
                     <div id="countdown-pre-sale"></div>
@@ -94,8 +96,8 @@
                 </div>
             </div>
 
-
             <h3>{{ trans('modules.about') }}</h3>
+
             <div class="card">
                 <table class="table">
                     <tbody>
diff --git a/resources/views/modules/my/index.blade.php b/resources/views/modules/my/index.blade.php
index 8327d99d5..34b5dd6e8 100644
--- a/resources/views/modules/my/index.blade.php
+++ b/resources/views/modules/my/index.blade.php
@@ -11,6 +11,7 @@
     @include('partials.modules.bar')
 
     <h2>{{ trans('modules.my.purchased') }}</h2>
+
     <div class="row">
         @if ($purchased)
             @foreach ($purchased as $module)
@@ -24,6 +25,7 @@
     </div>
 
     <h2>{{ trans('modules.my.installed') }}</h2>
+
     <div class="row">
         @if ($modules)
             @foreach ($modules as $module)
diff --git a/resources/views/modules/tiles/index.blade.php b/resources/views/modules/tiles/index.blade.php
index df0ce44bf..c7906cf4e 100644
--- a/resources/views/modules/tiles/index.blade.php
+++ b/resources/views/modules/tiles/index.blade.php
@@ -10,38 +10,37 @@
 @section('content')
     @include('partials.modules.bar')
 
-        <h2>{{ $title }}</h2>
-        <div class="row">
-            @if ($modules)
-                @foreach ($modules->data as $module)
-                    @if ($module->status_type == 'pre_sale')
-                        @include('partials.modules.pre_sale')
-                    @else
-                        @include('partials.modules.item')
-                    @endif
-                @endforeach
+    <h2>{{ $title }}</h2>
 
-                <div class="col-md-6 text-left">
-                    @if ($modules->current_page > 1)
-                        <a href="{{ url(request()->path()) }}?page={{ $modules->current_page - 1 }}" class="btn btn-white btn-sm button-header-top"><span class="fas fa-arrow-left"></span> &nbsp;{!! trans('pagination.previous') !!}</a>
-                    @endif
-                </div>
+    <div class="row">
+        @if ($modules)
+            @foreach ($modules->data as $module)
+                @if ($module->status_type == 'pre_sale')
+                    @include('partials.modules.pre_sale')
+                @else
+                    @include('partials.modules.item')
+                @endif
+            @endforeach
 
-                <div class="col-md-6 text-right">
-                    @if ($modules->current_page < $modules->last_page)
-                        <a href="{{ url(request()->path()) }}?page={{ $modules->current_page + 1 }}" class="btn btn-white btn-sm button-header-top">{!! trans('pagination.next') !!}&nbsp; <span class="fas fa-arrow-right"></span> </a>
-                    @endif
-                </div>
+            <div class="col-md-6 text-left">
+                @if ($modules->current_page > 1)
+                    <a href="{{ url(request()->path()) }}?page={{ $modules->current_page - 1 }}" class="btn btn-white btn-sm button-header-top"><span class="fas fa-arrow-left"></span> &nbsp;{!! trans('pagination.previous') !!}</a>
+                @endif
+            </div>
 
-            @else
-                <div class="col-md-12">
-                    @include('partials.modules.no_apps')
-                </div>
-            @endif
-        </div>
+            <div class="col-md-6 text-right">
+                @if ($modules->current_page < $modules->last_page)
+                    <a href="{{ url(request()->path()) }}?page={{ $modules->current_page + 1 }}" class="btn btn-white btn-sm button-header-top">{!! trans('pagination.next') !!}&nbsp; <span class="fas fa-arrow-right"></span> </a>
+                @endif
+            </div>
+        @else
+            <div class="col-md-12">
+                @include('partials.modules.no_apps')
+            </div>
+        @endif
+    </div>
 @endsection
 
 @push('scripts_start')
     <script src="{{ asset('public/js/modules/apps.js?v=' . version('short')) }}"></script>
 @endpush
-

From 724601ed3168e1ff65056052b815217e541ab38e Mon Sep 17 00:00:00 2001
From: Akaunting <batuhanbas@Batuhan-MacBook-Pro.local>
Date: Sat, 14 Mar 2020 17:57:32 +0300
Subject: [PATCH 64/65] left menu updated

---
 resources/views/partials/admin/menu.blade.php     | 2 +-
 resources/views/partials/admin/scripts.blade.php  | 5 -----
 resources/views/partials/portal/menu.blade.php    | 2 +-
 resources/views/partials/portal/scripts.blade.php | 5 -----
 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/resources/views/partials/admin/menu.blade.php b/resources/views/partials/admin/menu.blade.php
index 780533ee9..276b84952 100644
--- a/resources/views/partials/admin/menu.blade.php
+++ b/resources/views/partials/admin/menu.blade.php
@@ -1,5 +1,5 @@
 @stack('menu_start')
-    <nav class="sidenav navbar navbar-vertical fixed-left navbar-expand-xs navbar-light bg-default" id="sidenav-main">
+    <nav class="sidenav navbar navbar-vertical fixed-left navbar-expand-sm navbar-light bg-default" id="sidenav-main">
         <div class="scrollbar-inner">
             <div class="sidenav-header d-flex align-items-center ml-4">
                 <ul class="navbar-nav">
diff --git a/resources/views/partials/admin/scripts.blade.php b/resources/views/partials/admin/scripts.blade.php
index cf3c6d187..9aa57c37f 100644
--- a/resources/views/partials/admin/scripts.blade.php
+++ b/resources/views/partials/admin/scripts.blade.php
@@ -15,11 +15,6 @@
 
     <!-- Argon -->
     <script type="text/javascript">
-
-        if(window.screen.width<576) {
-            resolution = document.getElementById("leftMenu").classList.remove("g-sidenav-pinned");
-        }
-
         'use strict';
 
         var Layout = (function() {
diff --git a/resources/views/partials/portal/menu.blade.php b/resources/views/partials/portal/menu.blade.php
index c6f5089b3..659d5fe87 100644
--- a/resources/views/partials/portal/menu.blade.php
+++ b/resources/views/partials/portal/menu.blade.php
@@ -1,5 +1,5 @@
 @stack('menu_start')
-    <nav class="sidenav navbar navbar-vertical fixed-left navbar-expand-xs navbar-light bg-default" id="sidenav-main">
+    <nav class="sidenav navbar navbar-vertical fixed-left navbar-expand-sm navbar-light bg-default" id="sidenav-main">
         <div class="scrollbar-inner">
             <div class="sidenav-header d-flex align-items-center ml-4">
                 <ul class="navbar-nav">
diff --git a/resources/views/partials/portal/scripts.blade.php b/resources/views/partials/portal/scripts.blade.php
index d66dc07b0..7294a9999 100644
--- a/resources/views/partials/portal/scripts.blade.php
+++ b/resources/views/partials/portal/scripts.blade.php
@@ -16,11 +16,6 @@
     <!-- Argon -->
 
     <script type="text/javascript">
-
-        if(window.screen.width<576) {
-            resolution = document.getElementById("leftMenu").classList.remove("g-sidenav-pinned");
-        }
-
         'use strict';
 
         var Layout = (function() {

From 9c0adff4d2e929040840fb22f1808ff37ccb4957 Mon Sep 17 00:00:00 2001
From: denisdulici <denisdulici@gmail.com>
Date: Sat, 14 Mar 2020 23:18:59 +0300
Subject: [PATCH 65/65] added expand-sm to navbar

---
 public/css/akaunting-color.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/css/akaunting-color.css b/public/css/akaunting-color.css
index 514b7edaa..7ad483a6d 100644
--- a/public/css/akaunting-color.css
+++ b/public/css/akaunting-color.css
@@ -1981,7 +1981,7 @@ button.bg-yellow:focus
 /*--Selected Submenu Arrow Color Finish--*/
 
 /*--Selected Icon Color--*/
-.navbar-vertical.navbar-expand-xs .navbar-nav > .nav-item > .nav-link.active
+.navbar-vertical.navbar-expand-xs, .navbar-vertical.navbar-expand-sm .navbar-nav > .nav-item > .nav-link.active
 {
     color: #161842 !important;
 }
@@ -1995,14 +1995,14 @@ button.bg-yellow:focus
 /*--Selected Text Color Finish--*/
 
 /*--Selected Submenu Main Arrow Default Color--*/
-.navbar-vertical.navbar-expand-xs .navbar-nav > .nav-item > .nav-link.active.show[aria-expanded='false']:after
+.navbar-vertical.navbar-expand-xs, .navbar-vertical.navbar-expand-sm .navbar-nav > .nav-item > .nav-link.active.show[aria-expanded='false']:after
 {
     color:  #161842 !important;
 }
 /*--Selected Submenu Main Arrow Default Color Finish--*/
 
 /*--Selected Submenu Main Arrow Selected Color--*/
-.navbar-vertical.navbar-expand-xs .navbar-nav > .nav-item > .nav-link.active.show[aria-expanded='true']:after
+.navbar-vertical.navbar-expand-xs, .navbar-vertical.navbar-expand-sm .navbar-nav > .nav-item > .nav-link.active.show[aria-expanded='true']:after
 {
     color:  #161842 !important;
 }