Merge branch '2.1-dev' of github.com:akaunting/akaunting into search-filter

# Conflicts: # resources/assets/js/components/AkauntingSearch.vue
2020-11-10 22:25:03 +03:00
parent 93a62fed4a 374fa6b570
commit d4a3f9c1a3
35 changed files with 764 additions and 1526 deletions
--- a/resources/lang/en-GB/settings.php
+++ b/resources/lang/en-GB/settings.php
@ -68,6 +68,8 @@ return [
        'description'       => 'Default account, currency, language of your company',
        'list_limit'        => 'Records Per Page',
        'use_gravatar'      => 'Use Gravatar',
+        'income_category'   => 'Income Category',
+        'expense_category'  => 'Expense Category',
    ],

    'email' => [