Merge branch 'master' into master

resources/lang/de-DE/messages.php

@@ -26,7 +26,7 @@ return [
     'warning' => [
         'deleted'           => 'Warnung: Sie dürfen <b>:name</b> nicht löschen, da :text dazu in Bezug steht.',
         'disabled'          => 'Warnung: Sie dürfen <b>:name</b> nicht deaktivieren, da :text dazu in Bezug steht.',
-        'disable_code'      => 'Warning: You are not allowed to disable or change the currency of <b>:name</b> because it has :text related.',
+        'disable_code'      => 'Warnung: Sie dürfen die Währung von <b>:name</b> nicht deaktivieren oder verändern, da :text dazu in Bezug steht.',
     ],
 
 ];

resources/lang/de-DE/modules.php

@@ -23,6 +23,9 @@ return [
     'added'                 => 'Hinzugefügt',
     'updated'               => 'Aktualisiert',
     'compatibility'         => 'Kompatibilität',
+    'documentation'         => 'Dokumentation',
+    'view'                  => 'Ansicht',
+    'back'                  => 'Zurück',
 
     'installed'             => ':module installiert',
     'uninstalled'           => ':module deinstalliert',

resources/lang/de-DE/reconciliations.php

@@ -10,7 +10,7 @@ return [
     'start_date'            => 'Startdatum',
     'end_date'              => 'Enddatum',
     'cleared_amount'        => 'Ausgeglichener Betrag',
-    'deposit'               => 'Deposit',
-    'withdrawal'            => 'Withdrawal',
+    'deposit'               => 'Einzahlung',
+    'withdrawal'            => 'Auszahlung',
 
 ];

resources/lang/en-GB/bills.php

@@ -2,54 +2,57 @@
 
 return [
 
-    'bill_number'       => 'Bill Number',
-    'bill_date'         => 'Bill Date',
-    'total_price'       => 'Total Price',
-    'due_date'          => 'Due Date',
-    'order_number'      => 'Order Number',
-    'bill_from'         => 'Bill From',
+    'bill_number'           => 'Bill Number',
+    'bill_date'             => 'Bill Date',
+    'total_price'           => 'Total Price',
+    'due_date'              => 'Due Date',
+    'order_number'          => 'Order Number',
+    'bill_from'             => 'Bill From',
 
-    'quantity'          => 'Quantity',
-    'price'             => 'Price',
-    'sub_total'         => 'Subtotal',
-    'discount'          => 'Discount',
-    'tax_total'         => 'Tax Total',
-    'total'             => 'Total',
+    'quantity'              => 'Quantity',
+    'price'                 => 'Price',
+    'sub_total'             => 'Subtotal',
+    'discount'              => 'Discount',
+    'tax_total'             => 'Tax Total',
+    'total'                 => 'Total',
 
-    'item_name'         => 'Item Name|Item Names',
+    'item_name'             => 'Item Name|Item Names',
 
-    'show_discount'     => ':discount% Discount',
-    'add_discount'      => 'Add Discount',
-    'discount_desc'     => 'of subtotal',
+    'show_discount'         => ':discount% Discount',
+    'add_discount'          => 'Add Discount',
+    'discount_desc'         => 'of subtotal',
 
-    'payment_due'       => 'Payment Due',
-    'amount_due'        => 'Amount Due',
-    'paid'              => 'Paid',
-    'histories'         => 'Histories',
-    'payments'          => 'Payments',
-    'add_payment'       => 'Add Payment',
-    'mark_received'     => 'Mark Received',
-    'download_pdf'      => 'Download PDF',
-    'send_mail'         => 'Send Email',
+    'payment_due'           => 'Payment Due',
+    'amount_due'            => 'Amount Due',
+    'paid'                  => 'Paid',
+    'histories'             => 'Histories',
+    'payments'              => 'Payments',
+    'add_payment'           => 'Add Payment',
+    'mark_received'         => 'Mark Received',
+    'download_pdf'          => 'Download PDF',
+    'send_mail'             => 'Send Email',
+    'create_bill'           => 'Create Bill',
+    'receive_bill'          => 'Receive Bill',
+    'make_payment'          => 'Make Payment',
 
     'status' => [
-        'draft'         => 'Draft',
-        'received'      => 'Received',
-        'partial'       => 'Partial',
-        'paid'          => 'Paid',
+        'draft'             => 'Draft',
+        'received'          => 'Received',
+        'partial'           => 'Partial',
+        'paid'              => 'Paid',
     ],
 
     'messages' => [
-        'received'      => 'Bill marked as received successfully!',
-        'draft'          => 'This is a <b>DRAFT</b> bill and will be reflected to charts after it gets received.',
+        'received'          => 'Bill marked as received successfully!',
+        'draft'             => 'This is a <b>DRAFT</b> bill and will be reflected to charts after it gets received.',
 
         'status' => [
-            'created'   => 'Created on :date',
-            'receive'      => [
+            'created'       => 'Created on :date',
+            'receive' => [
                 'draft'     => 'Not sent',
                 'received'  => 'Received on :date',
             ],
-            'paid'      => [
+            'paid' => [
                 'await'     => 'Awaiting payment',
             ],
         ],

resources/lang/en-GB/demo.php

@@ -9,8 +9,5 @@ return [
     'currencies_eur'        => 'Euro',
     'currencies_gbp'        => 'British Pound',
     'currencies_try'        => 'Turkish Lira',
-    'taxes_exempt'          => 'Tax Exempt',
-    'taxes_normal'          => 'Normal Tax',
-    'taxes_sales'           => 'Sales Tax',
 
 ];

resources/lang/en-GB/general.php

@@ -40,6 +40,7 @@ return [
     'others'                => 'Other|Others',
     'contacts'              => 'Contact|Contacts',
     'reconciliations'       => 'Reconciliation|Reconciliations',
+    'developers'            => 'Developer|Developers',
 
     'dashboard'             => 'Dashboard',
     'banking'               => 'Banking',

resources/lang/en-GB/invoices.php

@@ -2,67 +2,70 @@
 
 return [
 
-    'invoice_number'    => 'Invoice Number',
-    'invoice_date'      => 'Invoice Date',
-    'total_price'       => 'Total Price',
-    'due_date'          => 'Due Date',
-    'order_number'      => 'Order Number',
-    'bill_to'           => 'Bill To',
+    'invoice_number'        => 'Invoice Number',
+    'invoice_date'          => 'Invoice Date',
+    'total_price'           => 'Total Price',
+    'due_date'              => 'Due Date',
+    'order_number'          => 'Order Number',
+    'bill_to'               => 'Bill To',
 
-    'quantity'          => 'Quantity',
-    'price'             => 'Price',
-    'sub_total'         => 'Subtotal',
-    'discount'          => 'Discount',
-    'tax_total'         => 'Tax Total',
-    'total'             => 'Total',
+    'quantity'              => 'Quantity',
+    'price'                 => 'Price',
+    'sub_total'             => 'Subtotal',
+    'discount'              => 'Discount',
+    'tax_total'             => 'Tax Total',
+    'total'                 => 'Total',
 
-    'item_name'         => 'Item Name|Item Names',
+    'item_name'             => 'Item Name|Item Names',
 
-    'show_discount'     => ':discount% Discount',
-    'add_discount'      => 'Add Discount',
-    'discount_desc'     => 'of subtotal',
+    'show_discount'         => ':discount% Discount',
+    'add_discount'          => 'Add Discount',
+    'discount_desc'         => 'of subtotal',
 
-    'payment_due'       => 'Payment Due',
-    'paid'              => 'Paid',
-    'histories'         => 'Histories',
-    'payments'          => 'Payments',
-    'add_payment'       => 'Add Payment',
-    'mark_paid'         => 'Mark Paid',
-    'mark_sent'         => 'Mark Sent',
-    'download_pdf'      => 'Download PDF',
-    'send_mail'         => 'Send Email',
-    'all_invoices'      => 'Login to view all invoices',
+    'payment_due'           => 'Payment Due',
+    'paid'                  => 'Paid',
+    'histories'             => 'Histories',
+    'payments'              => 'Payments',
+    'add_payment'           => 'Add Payment',
+    'mark_paid'             => 'Mark Paid',
+    'mark_sent'             => 'Mark Sent',
+    'download_pdf'          => 'Download PDF',
+    'send_mail'             => 'Send Email',
+    'all_invoices'          => 'Login to view all invoices',
+    'create_invoice'        => 'Create Invoice',
+    'send_invoice'          => 'Send Invoice',
+    'get_paid'              => 'Get Paid',
 
     'status' => [
-        'draft'         => 'Draft',
-        'sent'          => 'Sent',
-        'viewed'        => 'Viewed',
-        'approved'      => 'Approved',
-        'partial'       => 'Partial',
-        'paid'          => 'Paid',
+        'draft'             => 'Draft',
+        'sent'              => 'Sent',
+        'viewed'            => 'Viewed',
+        'approved'          => 'Approved',
+        'partial'           => 'Partial',
+        'paid'              => 'Paid',
     ],
 
     'messages' => [
-        'email_sent'     => 'Invoice email has been sent successfully!',
-        'marked_sent'    => 'Invoice marked as sent successfully!',
-        'email_required' => 'No email address for this customer!',
-        'draft'          => 'This is a <b>DRAFT</b> invoice and will be reflected to charts after it gets sent.',
+        'email_sent'        => 'Invoice email has been sent successfully!',
+        'marked_sent'       => 'Invoice marked as sent successfully!',
+        'email_required'    => 'No email address for this customer!',
+        'draft'             => 'This is a <b>DRAFT</b> invoice and will be reflected to charts after it gets sent.',
 
         'status' => [
-            'created'   => 'Created on :date',
-            'send'      => [
+            'created'       => 'Created on :date',
+            'send' => [
                 'draft'     => 'Not sent',
                 'sent'      => 'Sent on :date',
             ],
-            'paid'      => [
+            'paid' => [
                 'await'     => 'Awaiting payment',
             ],
         ],
     ],
 
     'notification' => [
-        'message'       => 'You are receiving this email because you have an upcoming :amount invoice to :customer customer.',
-        'button'        => 'Pay Now',
+        'message'           => 'You are receiving this email because you have an upcoming :amount invoice to :customer customer.',
+        'button'            => 'Pay Now',
     ],
 
 ];

resources/lang/fa-IR/auth.php

@@ -23,7 +23,7 @@ return [
     
     'error' => [
         'self_delete'       => 'خطا: نمی‌توانید خودتان حذف کنید!',
-        'no_company'        => 'خطا: هیچ کمپانی به حساب شما متصل نمیباشد. لطفا با مدیر سیستم تماس بگیرید.',
+        'no_company'        => 'خطا: هیچ کمپانی به حساب شما متصل نیست. لطفا با مدیر سیستم تماس بگیرید.',
     ],
 
     'failed'                => 'مشخصات وارد شده با اطلاعات ما سازگار نیست.',
@@ -31,7 +31,7 @@ return [
     'throttle'              => 'دفعات تلاش شما برای ورود بیش از حد مجاز است. لطفا پس از :seconds ثانیه مجددا تلاش فرمایید.',
 
     'notification' => [
-        'message_1'     => 'شما این ایمیل را دریافت نموده اید چون ما درخواست بازیابی رمزعبور حساب شما را دریافت کرده ای.',
+        'message_1'     => 'شما این ایمیل را دریافت نموده اید چون ما درخواست بازیابی رمزعبور حساب شما را دریافت کرده ایم.',
         'message_2'     => 'اگر شما درخواست بازیابی رمزعبور حسابتان را ثبت نکرده اید، این پیام را نادیده بگیرید.',
         'button'        => 'بازیابی رمزعبور',
     ],

resources/lang/fa-IR/general.php

@@ -40,8 +40,6 @@ return [
     'others'                => 'سایر |‌ سایرین',
     'contacts'              => 'Contact|Contacts',
     'reconciliations'       => 'Reconciliation|Reconciliations',
-    'deposits'              => 'Deposit|Deposits',
-    'withdrawals'           => 'Withdrawal|Withdrawals',
 
     'dashboard'             => 'پیشخوان',
     'banking'               => 'بانکداری',
@@ -85,7 +83,7 @@ return [
     'color'                 => 'رنگ',
     'save'                  => 'ذخیره کردن',
     'cancel'                => 'انصراف',
-    'loading'               => 'Loading...',
+    'loading'               => 'درحال بارگذاری...',
     'from'                  => 'از',
     'to'                    => 'به',
     'print'                 => 'چاپ کن',
@@ -106,26 +104,26 @@ return [
     'partially'             => 'جزئی',
     'partially_paid'        => 'پرداخت جزئی',
     'export'                => 'گرفتن خروجی',
-    'finish'                => 'Finish',
+    'finish'                => 'پایان',
     'wizard'                => 'Wizard',
-    'skip'                  => 'Skip',
+    'skip'                  => 'صرف‌نظر',
     'enable'                => 'فعال',
     'disable'               => 'غیر فعال',
-    'select_all'            => 'Select All',
-    'unselect_all'          => 'Unselect All',
-    'go_to'                 => 'Go to :name',
-    'created_date'          => 'Created Date',
-    'period'                => 'Period',
-    'start'                 => 'Start',
-    'end'                   => 'End',
-    'clear'                 => 'Clear',
-    'difference'            => 'Difference',
+    'select_all'            => 'انتخاب همه',
+    'unselect_all'          => 'عدم انتخاب همه',
+    'go_to'                 => 'برو به: نام',
+    'created_date'          => 'تاریخ ایجاد',
+    'period'                => 'دوره',
+    'start'                 => 'شروع',
+    'end'                   => 'پایان',
+    'clear'                 => 'پاک کردن',
+    'difference'            => 'تفاوت',
 
     'title' => [
         'new'               => ':type جدید',
         'edit'              => 'ویرایش :type',
-        'create'            => 'Create :type',
-        'send'              => 'Send :type',
+        'create'            => 'ایجاد: نوع',
+        'send'              => 'ارسال: نوع',
         'get'               => 'Get :type',
     ],
 
@@ -139,10 +137,10 @@ return [
     ],
 
     'date_range' => [
-        'today' => 'Today',
-        'yesterday' => 'Yesterday',
+        'today' => 'امروز',
+        'yesterday' => 'ديروز',
         'last_days' => 'Last :day Days',
-        'this_month' => 'This Month',
-        'last_month' => 'Last Month',
+        'this_month' => 'این ماه',
+        'last_month' => 'ماه قبل',
     ],
 ];

resources/lang/fa-IR/invoices.php

@@ -19,8 +19,8 @@ return [
     'item_name'         => 'نام آیتم | نام آیتم ها',
 
     'show_discount'     => ':discount% Discount',
-    'add_discount'      => 'Add Discount',
-    'discount_desc'     => 'of subtotal',
+    'add_discount'      => 'افزودن تخفیف',
+    'discount_desc'     => 'از جمع کل',
 
     'payment_due'       => 'سررسید پرداخت',
     'paid'              => 'پرداخت شده',
@@ -51,11 +51,11 @@ return [
         'status' => [
             'created'   => 'Created on :date',
             'send'      => [
-                'draft'     => 'Not sent',
+                'draft'     => 'ارسال نشده',
                 'sent'      => 'Sent on :date',
             ],
             'paid'      => [
-                'await'     => 'Awaiting payment',
+                'await'     => 'در انتظار پرداخت',
             ],
         ],
     ],

resources/lang/fa-IR/messages.php

@@ -11,6 +11,7 @@ return [
         'enabled'           => ':type enabled!',
         'disabled'          => ':type disabled!',
     ],
+
     'error' => [
         'over_payment'      => 'Error: Payment not added! The amount you entered passes the total: :amount',
         'not_user_company'  => 'خطا: شما اجازه مدیریت این شرکت را ندارید!',
@@ -21,9 +22,11 @@ return [
         'import_column'     => 'Error: :message Sheet name: :sheet. Line number: :line.',
         'import_sheet'      => 'Error: Sheet name is not valid. Please, check the sample file.',
     ],
+
     'warning' => [
         'deleted'           => 'هشدار: شما نمی توانید <b>:name</b> را به دلیل :text حذف کنید.',
         'disabled'          => 'هشدار: شما نمی توانید <b>:name</b> را به دلیل :text غیر فعال کنید.',
+        'disable_code'      => 'Warning: You are not allowed to disable or change the currency of <b>:name</b> because it has :text related.',
     ],
 
 ];

resources/lang/fa-IR/modules.php

@@ -4,25 +4,28 @@ return [
 
     'title'                 => 'API Token',
     'api_token'             => 'Token',
-    'my_apps'               => 'My Apps',
+    'my_apps'               => 'برنامه‌های من',
     'top_paid'              => 'بهترین غیر رایگان',
     'new'                   => 'جدید',
     'top_free'              => 'بهترین رایگان',
     'free'                  => 'رایگان',
-    'search'                => 'Search',
+    'search'                => 'جستجو',
     'install'               => 'نصب',
     'buy_now'               => 'خرید',
     'token_link'            => '<a href="https://akaunting.com/tokens" target="_blank">دریافت Token</a>.',
     'no_apps'               => 'در این بخش هیچ نرم افزاری وجود ندارد.',
     'developer'             => 'آیا شما یک توسعه دهنده هستید؟<a href="https://akaunting.com/blog/akaunting-app-store" target="_blank">با مراجعه به سایت فروشگاهی می توانید نرم افزار های خود را بسیازید و بفروشید.</a>',
 
-    'recommended_apps'      => 'Recommended Apps',
+    'recommended_apps'      => 'برنامه‌های توصیه شده',
 
     'about'                 => 'درباره ما',
 
     'added'                 => 'اضافه شد',
     'updated'               => 'به روز رسانی شده',
     'compatibility'         => 'سازگاری',
+    'documentation'         => 'مستندات',
+    'view'                  => 'مشاهده',
+    'back'                  => 'برگشت',
 
     'installed'             => ':module نصب شد',
     'uninstalled'           => ':module حذف شد',
@@ -34,7 +37,7 @@ return [
         'installation'      => 'نصب',
         'faq'               => 'سوالات متداول',
         'changelog'         => 'تغییرات',
-        'reviews'            => 'Reviews',
+        'reviews'            => 'نظرات',
     ],
 
     'installation' => [

resources/lang/fa-IR/reconciliations.php

@@ -6,9 +6,11 @@ return [
     'reconciled'            => 'Reconciled',
     'closing_balance'       => 'Closing Balance',
     'unreconciled'          => 'Unreconciled',
-    'list_transactions'     => 'List Transactions',
-    'start_date'            => 'Start Date',
-    'end_date'              => 'End Date',
+    'list_transactions'     => 'فهرست تراکنش‌ها',
+    'start_date'            => 'تاریخ شروع',
+    'end_date'              => 'تاریخ پایان',
     'cleared_amount'        => 'Cleared Amount',
+    'deposit'               => 'سپرده',
+    'withdrawal'            => 'Withdrawal',
 
 ];

resources/lang/it-IT/modules.php

@@ -23,6 +23,9 @@ return [
     'added'                 => 'Aggiunto',
     'updated'               => 'Aggiornato',
     'compatibility'         => 'Compatibilità',
+    'documentation'         => 'Documentazione',
+    'view'                  => 'Visualizza',
+    'back'                  => 'Indietro',
 
     'installed'             => ':module installato',
     'uninstalled'           => ':module disinstallato',

resources/lang/nb-NO/auth.php

@@ -23,7 +23,7 @@ return [
     
     'error' => [
         'self_delete'       => 'Feil: Du kan ikke slette deg selv.',
-        'no_company'        => 'Error: No company assigned to your account. Please, contact the system administrator.',
+        'no_company'        => 'Feil: Ingen foretak knyttet til din konto. Vennligst kontakt systemadministrator.',
     ],
 
     'failed'                => 'Disse opplysningene samsvarer ikke med våre oppføringer.',
@@ -31,9 +31,9 @@ return [
     'throttle'              => 'For mange innloggingsforsøk. Forsøk igjen om :seconds sekunder.',
 
     'notification' => [
-        'message_1'     => 'You are receiving this email because we received a password reset request for your account.',
-        'message_2'     => 'If you did not request a password reset, no further action is required.',
-        'button'        => 'Reset Password',
+        'message_1'     => 'Du mottar denne e-posten fordi vi mottok en forespørsel om pasordnullstilling for din konto.',
+        'message_2'     => 'Hvis du ikke ba om å nullstille passord trenger du ikke foreta deg noe mer.',
+        'button'        => 'Nullstill passord',
     ],
 
 ];

resources/lang/nb-NO/bills.php

@@ -16,7 +16,7 @@ return [
     'tax_total'         => 'Mva',
     'total'             => 'Totalt',
 
-    'item_name'         => 'Enhetsnavn | Enhetsnavn',
+    'item_name'         => 'Artikkelnavn | Artikkelnavn',
 
     'show_discount'     => ':discount% rabatt',
     'add_discount'      => 'Legg til rabatt',
@@ -26,7 +26,7 @@ return [
     'amount_due'        => 'Forfallsbeløp',
     'paid'              => 'Betalt',
     'histories'         => 'Historikk',
-    'payments'          => 'Betalinger',
+    'payments'          => 'Utbetalinger',
     'add_payment'       => 'Legg til betaling',
     'mark_received'     => 'Merk som mottatt',
     'download_pdf'      => 'Last ned PDF',
@@ -41,16 +41,16 @@ return [
 
     'messages' => [
         'received'      => 'Faktura ble merket som mottatt.',
-        'draft'          => 'This is a <b>DRAFT</b> bill and will be reflected to charts after it gets received.',
+        'draft'          => 'Dette er en <b>KLADD</b> for fakturaen som vil bli oppdatert etter at den er mottatt.',
 
         'status' => [
-            'created'   => 'Created on :date',
+            'created'   => 'Opprettet :date',
             'receive'      => [
-                'draft'     => 'Not sent',
-                'received'  => 'Received on :date',
+                'draft'     => 'Ikke sendt',
+                'received'  => 'Mottatt :date',
             ],
             'paid'      => [
-                'await'     => 'Awaiting payment',
+                'await'     => 'Avventer betaling',
             ],
         ],
     ],

resources/lang/nb-NO/companies.php

@@ -7,7 +7,7 @@ return [
     'manage'                => 'Administrer foretak',
     'all'                   => 'Alle foretak',
     'error' => [
-        'delete_active'     => 'Feil. Kan ikke slette aktivt firma, du må bytte først.',
+        'delete_active'     => 'Feil. Kan ikke slette aktivt foretak, du må bytte først!',
     ],
 
 ];

resources/lang/nb-NO/customers.php

@@ -10,7 +10,7 @@ return [
     ],
 
     'notification' => [
-        'message'       => ':customer made :amount payment to invoice number :invoice_number.',
-        'button'        => 'Show',
+        'message'       => ':customer betalte :amount mot faktura :invoice_number.',
+        'button'        => 'Vis',
     ],
 ];

resources/lang/nb-NO/general.php

@@ -2,15 +2,15 @@
 
 return [
 
-    'items'                 => 'Enhet | Enheter',
+    'items'                 => 'Artikkel | Artikler',
     'incomes'               => 'Inntekt | Inntekter',
     'invoices'              => 'Faktura | Fakturaer',
-    'revenues'              => 'Inntekt | Inntekter',
+    'revenues'              => 'Innbetaling | Innbetalinger',
     'customers'             => 'Kunde | Kunder',
     'expenses'              => 'Utgift | Utgifter',
     'bills'                 => 'Faktura | Fakturaer',
-    'payments'              => 'Betaling | Betalinger',
-    'vendors'               => 'Selger | Selgere',
+    'payments'              => 'Utbetaling | Utbetalinger',
+    'vendors'               => 'Leverandør | Leverandører',
     'accounts'              => 'Konto | Kontoer',
     'transfers'             => 'Overføring | Overføringer',
     'transactions'          => 'Transaksjon | Transaksjoner',
@@ -30,7 +30,7 @@ return [
     'pictures'              => 'Bilde | Bilder',
     'types'                 => 'Type | Typer',
     'payment_methods'       => 'Betalingsmåte | Betalingsmåter',
-    'compares'              => 'Inntekt vs. utgift | Inntekter vs. utgifter',
+    'compares'              => 'Inntekt mot utgift | Inntekter mot utgifter',
     'notes'                 => 'Notat | Notater',
     'totals'                => 'Totalt | Totaler',
     'languages'             => 'Språk | Språk',
@@ -38,10 +38,8 @@ return [
     'numbers'               => 'Nummer | Nummer',
     'statuses'              => 'Status | Statuser',
     'others'                => 'Annen | Andre',
-    'contacts'              => 'Contact|Contacts',
-    'reconciliations'       => 'Reconciliation|Reconciliations',
-    'deposits'              => 'Deposit|Deposits',
-    'withdrawals'           => 'Withdrawal|Withdrawals',
+    'contacts'              => 'Kontakt|Kontakter',
+    'reconciliations'       => 'Avstemming|avstemminger',
 
     'dashboard'             => 'Kontrollpanel',
     'banking'               => 'Bank',
@@ -68,7 +66,7 @@ return [
     'delete_confirm'        => 'Bekreft sletting av :name :type?',
     'name'                  => 'Navn',
     'email'                 => 'E-post',
-    'tax_number'            => 'Organisasjonsnummer',
+    'tax_number'            => 'Org.nr',
     'phone'                 => 'Telefon',
     'address'               => 'Adresse',
     'website'               => 'Nettside',
@@ -85,7 +83,7 @@ return [
     'color'                 => 'Farge',
     'save'                  => 'Lagre',
     'cancel'                => 'Avbryt',
-    'loading'               => 'Loading...',
+    'loading'               => 'Laster...',
     'from'                  => 'Fra',
     'to'                    => 'Til',
     'print'                 => 'Skriv ut',
@@ -105,28 +103,28 @@ return [
     'overdue'               => 'Forfalt',
     'partially'             => 'Delvis',
     'partially_paid'        => 'Delvis betalt',
-    'export'                => 'Export',
-    'finish'                => 'Finish',
-    'wizard'                => 'Wizard',
-    'skip'                  => 'Skip',
-    'enable'                => 'Enable',
-    'disable'               => 'Disable',
-    'select_all'            => 'Select All',
-    'unselect_all'          => 'Unselect All',
-    'go_to'                 => 'Go to :name',
-    'created_date'          => 'Created Date',
-    'period'                => 'Period',
+    'export'                => 'Eksport',
+    'finish'                => 'Ferdigstill',
+    'wizard'                => 'Veiledning',
+    'skip'                  => 'Hopp over',
+    'enable'                => 'Aktiver',
+    'disable'               => 'Deaktiver',
+    'select_all'            => 'Velg alle',
+    'unselect_all'          => 'Velg ingen',
+    'go_to'                 => 'Gå til :name',
+    'created_date'          => 'Opprettet dato',
+    'period'                => 'Periode',
     'start'                 => 'Start',
-    'end'                   => 'End',
-    'clear'                 => 'Clear',
-    'difference'            => 'Difference',
+    'end'                   => 'Slutt',
+    'clear'                 => 'Nullstill',
+    'difference'            => 'Forskjell',
 
     'title' => [
         'new'               => 'Ny :type',
         'edit'              => 'Endre :type',
-        'create'            => 'Create :type',
+        'create'            => 'Opprett :type',
         'send'              => 'Send :type',
-        'get'               => 'Get :type',
+        'get'               => 'Motta :type',
     ],
 
     'form' => [
@@ -139,10 +137,10 @@ return [
     ],
 
     'date_range' => [
-        'today' => 'Today',
-        'yesterday' => 'Yesterday',
-        'last_days' => 'Last :day Days',
-        'this_month' => 'This Month',
-        'last_month' => 'Last Month',
+        'today' => 'I dag',
+        'yesterday' => 'I går',
+        'last_days' => 'Siste :day dager',
+        'this_month' => 'Denne måneden',
+        'last_month' => 'Forrige måned',
     ],
 ];

resources/lang/nb-NO/header.php

@@ -8,7 +8,7 @@ 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 produkt|[2,*] :count utsolgte produkter',
+        'items_stock'       => '{1} :count utsolgt artikkel|[2,*] :count utsolgte artikler',
         'view_all'          => 'Vis alle'
     ],
     'docs_link'             => 'https://akaunting.com/docs',

resources/lang/nb-NO/import.php

@@ -4,6 +4,6 @@ return [
 
     'import'                => 'Importer',
     'title'                 => 'Importer :type',
-    'message'               => 'Allowed file types: XLS, XLSX. Please, <a target="_blank" href=":link"><strong>download</strong></a> the sample file.',
+    'message'               => 'Tillate filtyper: XLS, XLSX. Vennligst <a target="_blank" href=":link"><strong>last ned</strong></a> malfilen.',
 
 ];

resources/lang/nb-NO/install.php

@@ -6,7 +6,7 @@ return [
     'refresh'               => 'Oppfrisk',
 
     'steps' => [
-        'requirements'      => 'Please, ask your hosting provider to fix the errors!',
+        'requirements'      => 'Vennligst anmod din tjenestetilbyder om å rette opp problemene!',
         'language'          => 'Steg 1/3: Språkvalg',
         'database'          => 'Steg 2/3: Databaseoppsett',
         'settings'          => 'Steg 3/3: Foretak- og administratordetaljer',
@@ -19,7 +19,7 @@ return [
     'requirements' => [
         'enabled'           => ':feature må være aktivert.',
         'disabled'          => ':feature må være deaktivert.',
-        'extension'         => ':extension extension needs to be installed and loaded!',
+        'extension'         => 'Utvidelsen :extension må installeres og aktiveres!',
         'directory'         => 'Mappen :directory må være skrivbar.',
     ],
 

resources/lang/nb-NO/invoices.php

@@ -16,7 +16,7 @@ return [
     'tax_total'         => 'Totalt mva',
     'total'             => 'Totalt',
 
-    'item_name'         => 'Enhetsnavn | Enhetsnavn',
+    'item_name'         => 'Artikkelnavn | Artikkelnavn',
 
     'show_discount'     => ':discount% rabatt',
     'add_discount'      => 'Legg til rabatt',
@@ -25,13 +25,13 @@ return [
     'payment_due'       => 'Forfallsdato',
     'paid'              => 'Betalt',
     'histories'         => 'Historikk',
-    'payments'          => 'Betalinger',
+    'payments'          => 'Utbetalinger',
     'add_payment'       => 'Legg til betaling',
     'mark_paid'         => 'Merk som betalt',
     'mark_sent'         => 'Merk som sendt',
     'download_pdf'      => 'Last ned PDF',
     'send_mail'         => 'Send e-post',
-    'all_invoices'      => 'Login to view all invoices',
+    'all_invoices'      => 'Logg inn for å se alle fakturaer',
 
     'status' => [
         'draft'         => 'Utkast',
@@ -46,22 +46,22 @@ return [
         'email_sent'     => 'E-post med faktura har blitt sendt.',
         'marked_sent'    => 'Faktura merket som sendt.',
         'email_required' => 'E-postadresse må fylles inn.',
-        'draft'          => 'This is a <b>DRAFT</b> invoice and will be reflected to charts after it gets sent.',
+        'draft'          => 'Dette er en <b>KLADD</b> for fakturaen som vil bli oppdatert etter at den er sendt.',
 
         'status' => [
-            'created'   => 'Created on :date',
+            'created'   => 'Opprettet :date',
             'send'      => [
-                'draft'     => 'Not sent',
-                'sent'      => 'Sent on :date',
+                'draft'     => 'Ikke sendt',
+                'sent'      => 'Sendt :date',
             ],
             'paid'      => [
-                'await'     => 'Awaiting payment',
+                'await'     => 'Avventer betaling',
             ],
         ],
     ],
 
     'notification' => [
-        'message'       => 'Du mottar denne e-posten fordi du har en kommende faktura, pålydende  :amount, til :costumer.',
+        'message'       => 'Du mottar denne e-posten med faktura til :customer, pålydende :amount.',
         'button'        => 'Betal nå',
     ],
 

resources/lang/nb-NO/items.php

@@ -9,8 +9,8 @@ return [
 
     'notification' => [
         'message'       => [
-            'reminder' => 'You are receiving this email because only :quantity of :name has remained.',
-            'out_of_stock' => 'You are receiving this email because the :name is running out of stock.',
+            '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å',
     ],

resources/lang/nb-NO/messages.php

@@ -8,22 +8,25 @@ return [
         'deleted'           => ':type slettet.',
         'duplicated'        => ':type duplisert.',
         'imported'          => ':type importert.',
-        'enabled'           => ':type enabled!',
-        'disabled'          => ':type disabled!',
+        'enabled'           => ':type aktivert!',
+        'disabled'          => ':type deaktivert!',
     ],
+
     'error' => [
-        'over_payment'      => 'Error: Payment not added! The amount you entered passes the total: :amount',
+        'over_payment'      => 'Feil: Betaling er ikke lagt til! Beløpet overskrider totalbeløp: :amount',
         'not_user_company'  => 'Feil: Du ikke kan administrere dette foretaket.',
         '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_token'     => 'Feil: Angitt token er ugyldig.',
-        'import_column'     => 'Error: :message Sheet name: :sheet. Line number: :line.',
-        'import_sheet'      => 'Error: Sheet name is not valid. Please, check the sample file.',
+        'import_column'     => 'Feil: :message Arknavn: :sheet. Linjenummer: :line.',
+        'import_sheet'      => 'Feil: Arknavn er ikke gyldig. Vennligst sjekk malfilen.',
     ],
+
     'warning' => [
         '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.',
     ],
 
 ];

resources/lang/nb-NO/modules.php

@@ -4,7 +4,7 @@ return [
 
     'title'                 => 'API-token',
     'api_token'             => 'Token',
-    'my_apps'               => 'My Apps',
+    'my_apps'               => 'Mine applikasjoner',
     'top_paid'              => 'Topp betalte',
     'new'                   => 'Ny',
     'top_free'              => 'Topp gratis',
@@ -16,13 +16,16 @@ return [
     '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.',
 
-    'recommended_apps'      => 'Recommended Apps',
+    'recommended_apps'      => 'Anbefalte applikasjoner',
 
     'about'                 => 'Om',
 
     'added'                 => 'Lagt til',
     'updated'               => 'Oppdatert',
     'compatibility'         => 'Kompatibilitet',
+    'documentation'         => 'Dokumentasjon',
+    'view'                  => 'Se',
+    'back'                  => 'Tilbake',
 
     'installed'             => ':module installert',
     'uninstalled'           => ':module avinstallert',
@@ -34,30 +37,30 @@ return [
         'installation'      => 'Installering',
         'faq'               => 'FAQ',
         'changelog'         => 'Endringslogg',
-        'reviews'            => 'Reviews',
+        'reviews'            => 'Anmeldelser',
     ],
 
     'installation' => [
         'header'            => 'Applikasjonsinstallering',
         'download'          => 'Laster ned :module.',
         'unzip'             => 'Pakker ut :module.',
-        'file_copy'         => 'Copying :module files.',
-        'migrate'           => 'Applying :module updates.',
-        'finish'            => 'The update was successfully installed. You will be redirect Update Center.',
+        'file_copy'         => 'Kopierer filer til :module.',
+        'migrate'           => 'Legger til :module oppdateringer.',
+        'finish'            => 'Oppdateringen ble installert. Du vil bli videresendt til Oppdateringssenter.',
         'install'           => 'Installerer :module.',
     ],
 
     'errors' => [
-        'download' => ':module can not download!',
-        'upload' => 'Downloaded :module can not saved!',
-        'unzip' => ':module can not unzip!',
-        'file_copy' => ':module files can not copy!',
-        'migrate' => ':module migrate broken!',
-        'migrate core' => ':module already latest version so then yon can not update.',
+        '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.',
     ],
 
     'badge' => [
-        'installed' => 'Installed',
+        'installed' => 'Innstallert',
     ],
 
     'button' => [
@@ -67,14 +70,14 @@ return [
     ],
 
     'my' => [
-        'purchased' => 'Purchased',
-        'installed' => 'Installed',
+        'purchased' => 'Kjøpt',
+        'installed' => 'Installert',
     ],
 
     'reviews' => [
         'button' => [
-            'add' => 'Add a Review'
+            'add' => 'Legg til anmeldelse'
         ],
-        'na' => 'There are no reviews.'
+        'na' => 'Det er ingen anmeldelser.'
     ]
 ];

resources/lang/nb-NO/notifications.php

@@ -2,9 +2,9 @@
 
 return [
 
-    'whoops'              => 'Whoops!',
-    'hello'               => 'Hello!',
-    'salutation'          => 'Regards,<br> :company_name',
-    'subcopy'             => 'If you’re having trouble clicking the ":text" button, copy and paste the URL below into your web browser: [:url](:url)',
+    'whoops'              => 'Uff!',
+    'hello'               => 'God dag!',
+    'salutation'          => 'Vennlig hilsen<br> :company_name',
+    'subcopy'             => 'Hvis du har problememer med å klikke på ":text" knappen, vennligst kopier følgende URL til din nettleser: [:url](:url)',
 
 ];

resources/lang/nb-NO/passwords.php

@@ -13,7 +13,7 @@ return [
     |
     */
 
-    'password' => 'Passord må inneholde minst seks tegn, og også være være lik bekreftelsen.',
+    'password' => 'Passord må inneholde minst seks tegn og være være lik bekreftelsen.',
     'reset' => 'Passordet ble endret.',
     'sent' => 'Vi har sendt deg en lenke på e-post, som du kan klikke på for å endre passord.',
     'token' => 'Nullstillingskode for passord er ugyldig.',

resources/lang/nb-NO/reconciliations.php

@@ -2,13 +2,15 @@
 
 return [
 
-    'reconcile'             => 'Reconcile',
-    'reconciled'            => 'Reconciled',
-    'closing_balance'       => 'Closing Balance',
-    'unreconciled'          => 'Unreconciled',
-    'list_transactions'     => 'List Transactions',
-    'start_date'            => 'Start Date',
-    'end_date'              => 'End Date',
-    'cleared_amount'        => 'Cleared Amount',
+    'reconcile'             => 'Avstem',
+    'reconciled'            => 'Avstemt',
+    'closing_balance'       => 'Sluttbalanse',
+    'unreconciled'          => 'Uavstemt',
+    'list_transactions'     => 'Vis transaksjoner',
+    'start_date'            => 'Startdato',
+    'end_date'              => 'Sluttdato',
+    'cleared_amount'        => 'Klarert beløp',
+    'deposit'               => 'Innskudd',
+    'withdrawal'            => 'Uttak',
 
 ];

resources/lang/nb-NO/reports.php

@@ -16,7 +16,7 @@ return [
     'summary' => [
         'income'            => 'Inntektsammendrag',
         'expense'           => 'Utgiftsammendrag',
-        'income_expense'    => 'Inntekter mot utgifter',
+        'income_expense'    => 'Inntekt mot utgift',
         'tax'               => 'Avgiftsammendrag',
     ],
 

resources/lang/nb-NO/settings.php

@@ -33,16 +33,16 @@ return [
         'digit'             => 'Antall siffer',
         'next'              => 'Neste nummer',
         'logo'              => 'Logo',
-        'custom'            => 'Custom',
-        'item_name'         => 'Item Name',
-        'item'              => 'Items',
-        'product'           => 'Products',
-        'service'           => 'Services',
-        'price_name'        => 'Price Name',
-        'price'             => 'Price',
-        'rate'              => 'Rate',
-        'quantity_name'     => 'Quantity Name',
-        'quantity'          => 'Quantity',
+        'custom'            => 'Tilpasset',
+        'item_name'         => 'Artikkelnavn',
+        'item'              => 'Artikler',
+        'product'           => 'Produkter',
+        'service'           => 'Tjenester',
+        'price_name'        => 'Prisnavn',
+        'price'             => 'Pris',
+        'rate'              => 'Sats',
+        'quantity_name'     => 'Kvantitetsnavn',
+        'quantity'          => 'Kvantitet',
     ],
     'default' => [
         'tab'               => 'Standardinnstilinger',
@@ -76,8 +76,8 @@ return [
         'bill_days'         => 'Antall dager før forfall for utsending',
         'cron_command'      => 'Cron-kommando',
         'schedule_time'     => 'Tid for kjøring',
-        'send_item_reminder'=> 'Send Item Reminder',
-        'item_stocks'       => 'Send When Item Stock',
+        'send_item_reminder'=> 'Send artikkelpåminnelse',
+        'item_stocks'       => 'Send en lagerpåminnelse',
     ],
     'appearance' => [
         'tab'               => 'Utseende',

resources/lang/nb-NO/taxes.php

@@ -4,5 +4,8 @@ return [
 
     'rate'                  => 'Sats',
     'rate_percent'          => 'Sats (%)',
+    'normal'                => 'Normal',
+    'inclusive'             => 'Inklusiv',
+    'compound'              => 'Tillegg',
 
 ];

resources/lang/nb-NO/transfers.php

@@ -6,7 +6,7 @@ return [
     'to_account'            => 'Til konto',
 
     'messages' => [
-        'delete'            => ':from to :to (:amount)',
+        'delete'            => ':from til :to (:amount)',
     ],
 
 ];

resources/lang/nb-NO/validation.php

@@ -101,8 +101,8 @@ return [
         'attribute-name' => [
             'rule-name' => 'custom-message',
         ],
-        'invalid_currency' => 'The :attribute code is invalid.',
-        'invalid_amount'   => 'The amount :attribute is invalid.',
+        'invalid_currency' => ':attribute koden er feil.',
+        'invalid_amount'   => 'Beløpets :attribute er feil.',
     ],
 
     /*

resources/lang/nl-NL/bills.php

@@ -41,7 +41,7 @@ return [
 
     'messages' => [
         'received'      => 'Factuur als \'succesvol ontvangen\' gemarkeerd!',
-        'draft'          => 'This is a <b>DRAFT</b> bill and will be reflected to charts after it gets received.',
+        'draft'          => 'Dit is een <b>CONCEPT</b> factuur en zal in de statistieken terugkomen zodra het is ontvangen.',
 
         'status' => [
             'created'   => 'Gemaakt op :date',

resources/lang/nl-NL/modules.php

@@ -23,6 +23,9 @@ return [
     'added'                 => 'Toegevoegd',
     'updated'               => 'Bijgewerkt',
     'compatibility'         => 'Compatibiliteit',
+    'documentation'         => 'Documentation',
+    'view'                  => 'View',
+    'back'                  => 'Back',
 
     'installed'             => ':module geïnstalleerd',
     'uninstalled'           => ':module verwijderd',

resources/lang/pt-BR/bills.php

@@ -41,7 +41,7 @@ return [
 
     'messages' => [
         'received'      => 'Conta marcada como recebida com sucesso!',
-        'draft'          => 'Este é um <b>RASCUNHO</b> de fatura e será refletida nos gráficos depois que ela for recebida.',
+        'draft'          => 'This is a <b>DRAFT</b> bill and will be reflected to charts after it gets received.',
 
         'status' => [
             'created'   => 'Criado em :date',

resources/lang/pt-BR/general.php

@@ -40,8 +40,6 @@ return [
     'others'                => 'Outro | Outros',
     'contacts'              => 'Contato|Contatos',
     'reconciliations'       => 'Reconciliação|Reconciliações',
-    'deposits'              => 'Deposito|Depositos',
-    'withdrawals'           => 'Retirada|Retiradas',
 
     'dashboard'             => 'Painel',
     'banking'               => 'Banco',

resources/lang/pt-BR/messages.php

@@ -11,6 +11,7 @@ return [
         'enabled'           => ': tipo habilitado!',
         'disabled'          => ': tipo desativado!',
     ],
+
     'error' => [
         'over_payment'      => 'Erro: Pagamento não adicionado! O valor que você inseriu passa o total: :amount',
         'not_user_company'  => 'Erro: você não tem permissão para gerenciar esta empresa!',
@@ -21,9 +22,11 @@ return [
         'import_column'     => 'Erro: :message Planilha: :sheet. Número da linha: :line.',
         'import_sheet'      => 'Erro: Planilha não é válida. Por favor, verifique o arquivo de exemplo.',
     ],
+
     'warning' => [
         'deleted'           => 'Aviso: Você não têm permissão para excluir <b>:name</b>, porque possui o :text relacionado.',
         'disabled'          => 'Aviso: Você não tem permissão para desativar <b>:name</b>, porque tem :text relacionado.',
+        'disable_code'      => 'Aviso: você não tem permissão para desativar ou alterar a moeda de <b>:name</b> porque possui :text relacionado.',
     ],
 
 ];

resources/lang/pt-BR/modules.php

@@ -23,6 +23,9 @@ return [
     'added'                 => 'Adicionado',
     'updated'               => 'Atualizado',
     'compatibility'         => 'Compatibilidade',
+    'documentation'         => 'Documentação',
+    'view'                  => 'Ver',
+    'back'                  => 'Voltar',
 
     'installed'             => ':module instalado',
     'uninstalled'           => ':module removido',

resources/lang/pt-BR/reconciliations.php

@@ -10,5 +10,7 @@ return [
     'start_date'            => 'Data de início',
     'end_date'              => 'Data Final',
     'cleared_amount'        => 'Quantidade liberada',
+    'deposit'               => 'Depósito',
+    'withdrawal'            => 'Saque',
 
 ];

resources/lang/sq-AL/general.php

@@ -40,8 +40,6 @@ return [
     'others'                => 'Tjetër | Të tjera',
     'contacts'              => 'Kontakti | Kontaktet',
     'reconciliations'       => 'Pajtimi | Pajtimet',
-    'deposits'              => 'Depozita | Depozitat',
-    'withdrawals'           => 'Tërheqje | Tërheqjet',
 
     'dashboard'             => 'Paneli Kryesor',
     'banking'               => 'Veprime Bankare',

resources/lang/sq-AL/messages.php

@@ -11,6 +11,7 @@ return [
         'enabled'           => ':type aktivizuar!',
         'disabled'          => ':type çaktivizuar!',
     ],
+
     'error' => [
         'over_payment'      => 'Gabim: Pagesa nuk u shtua! Shuma që keni futur kalon totalin: amount',
         'not_user_company'  => 'Gabim: Nuk ju lejohet të menaxhoni këtë kompani!',
@@ -21,9 +22,11 @@ return [
         'import_column'     => 'Gabim: :message Fleta name: :sheet. Rreshti number: :line.',
         'import_sheet'      => 'Gabim: Emri i fletës nuk është i vlefshëm. Ju lutem, kontrolloni skedarin e mostrës.',
     ],
+
     'warning' => [
         'deleted'           => 'Njoftim: <b>:name</b> nuk mund të fshihet sepse ka :text të lidhur.',
         'disabled'          => 'Njoftim: <b>:name</b> nuk mund të disable sepse ka :text të lidhur.',
+        'disable_code'      => 'Njoftim: Nuk ju lejohet të çaktivizoni ose të ndryshoni monedhën e <b>:name</b>, sepse ajo ka :text e lidhur.',
     ],
 
 ];

resources/lang/sq-AL/modules.php

@@ -23,6 +23,9 @@ return [
     'added'                 => 'Shtuar',
     'updated'               => 'Përditësuar',
     'compatibility'         => 'Pajtueshmëri',
+    'documentation'         => 'Dokumentacioni',
+    'view'                  => 'Pamje',
+    'back'                  => 'Mbrapa',
 
     'installed'             => ':module instaluar',
     'uninstalled'           => ':module çinstaluar',

resources/lang/sq-AL/reconciliations.php

@@ -10,5 +10,7 @@ return [
     'start_date'            => 'Data e Fillimit',
     'end_date'              => 'Data e Mbarimit',
     'cleared_amount'        => 'Shuma e Pastruar',
+    'deposit'               => 'Depozite',
+    'withdrawal'            => 'Tërheqje',
 
 ];

resources/lang/sr-RS/customers.php

@@ -10,7 +10,7 @@ return [
     ],
 
     'notification' => [
-        'message'       => ': купац направио: износ уплате на број фактуре: инвоице_нумбер.',
+        'message'       => ':customer је уплатио :amount по фактури број :invoice_number.',
         'button'        => 'Прикажи',
     ],
 ];

resources/lang/sr-RS/dashboard.php

@@ -10,7 +10,7 @@ return [
     'payables'                  => 'Дуговања',
     'open_bills'                => 'Отворени рачуни',
     'overdue_bills'             => 'Неплаћени рачуни',
-    'total_profit'              => 'Укупна допит',
+    'total_profit'              => 'Укупна добит',
     'open_profit'               => 'Отворена добит',
     'overdue_profit'            => 'Доспела добит',
     'cash_flow'                 => 'Новчани ток',

resources/lang/sr-RS/footer.php

@@ -5,6 +5,6 @@ return [
     'version'               => 'Верзија',
     'powered'               => 'Омогућио вам је Akaunting',
     'link'                  => 'https://akaunting.com',
-    'software'              => 'Слободан рачуноводсвени програм',
+    'software'              => 'Слободан рачуноводствени програм',
 
 ];

resources/lang/sr-RS/general.php

@@ -40,8 +40,6 @@ return [
     'others'                => 'Остали|Остало',
     'contacts'              => 'Контакт|Контакти',
     'reconciliations'       => 'Сравњење|Сравњивања',
-    'deposits'              => 'Депозит|Депозити',
-    'withdrawals'           => 'Опозив|Опозиви',
 
     'dashboard'             => 'Контролна табла',
     'banking'               => 'Банкарство',

resources/lang/sr-RS/invoices.php

@@ -61,7 +61,7 @@ return [
     ],
 
     'notification' => [
-        'message'       => 'Примили сте ову е-пошту јер имате долазну :amount фактуру за :customer.',
+        'message'       => 'Примили сте ову е-пошту јер имате долазну фактуру од :amount за :customer.',
         'button'        => 'Платите сада',
     ],
 

resources/lang/sr-RS/messages.php

@@ -11,6 +11,7 @@ return [
         'enabled'           => ':type омогућен!',
         'disabled'          => ':type онемогућен!',
     ],
+
     'error' => [
         'over_payment'      => 'Грешка: Уплата није додата! Износ који сте унели прелази укупан износ: :amount',
         'not_user_company'  => 'Грешка: Није вам дозвољено управљање овом фирмом!',
@@ -21,9 +22,11 @@ return [
         'import_column'     => 'Грешка: :message Назив табле: :sheet. Број линије: :line.',
         'import_sheet'      => 'Грешка: Назив табле није валидан. Молимо Вас, проверите фајл узорак.',
     ],
+
     'warning' => [
         'deleted'           => 'Упозорење: Није вам дозвољено да избришете <b>:name</b> јер постоји веза са :text.',
         'disabled'          => 'Упозорење: Није вам дозвољено да онемогућите <b>:name</b> јер постоји веза са :text.',
+        'disable_code'      => 'Warning: You are not allowed to disable or change the currency of <b>:name</b> because it has :text related.',
     ],
 
 ];

resources/lang/sr-RS/modules.php

@@ -23,6 +23,9 @@ return [
     'added'                 => 'Додато',
     'updated'               => 'Ажурирано',
     'compatibility'         => 'Компатибилност',
+    'documentation'         => 'Documentation',
+    'view'                  => 'View',
+    'back'                  => 'Back',
 
     'installed'             => ':module инсталирана',
     'uninstalled'           => ':module разинсталирана',

resources/lang/sr-RS/notifications.php

@@ -2,9 +2,9 @@
 
 return [
 
-    'whoops'              => 'Ууупс!',
+    'whoops'              => 'Упс!',
     'hello'               => 'Здраво!',
-    'salutation'          => 'Поздрави, <br> :company_name',
-    'subcopy'             => 'Ако имате проблема кликнути на „:text” дугме, копирајте и налепите УРЛ адресу испод у wеб прегледачу: [:url](:url)',
+    'salutation'          => 'С поштовањем, <br> :company_name',
+    'subcopy'             => 'Ако имате проблема кликнути на „:text” дугме, копирајте и налепите УРЛ адресу испод у веб прегледачу: [:url](:url)',
 
 ];

resources/lang/sr-RS/reconciliations.php

@@ -10,5 +10,7 @@ return [
     'start_date'            => 'Датум почетка',
     'end_date'              => 'Датум завршетка',
     'cleared_amount'        => 'Очишћен износ',
+    'deposit'               => 'Deposit',
+    'withdrawal'            => 'Withdrawal',
 
 ];

resources/lang/sr-RS/taxes.php

@@ -5,7 +5,7 @@ return [
     'rate'                  => 'Стопа',
     'rate_percent'          => 'Стопа (%)',
     'normal'                => 'Нормално',
-    'inclusive'             => 'Укључујући',
-    'compound'              => 'Спој',
+    'inclusive'             => 'Укључен',
+    'compound'              => 'Кумулативан',
 
 ];

resources/lang/tr-TR/modules.php

@@ -23,6 +23,9 @@ return [
     'added'                 => 'Ekleme Tarihi',
     'updated'               => 'Güncelleme Tarihi',
     'compatibility'         => 'Uyumluluk',
+    'documentation'         => 'Dökümantasyon',
+    'view'                  => 'Görüntüle',
+    'back'                  => 'Geri',
 
     'installed'             => ':module yüklendi',
     'uninstalled'           => ':module kaldırıldı',
@@ -34,7 +37,7 @@ return [
         'installation'      => 'Yükleme',
         'faq'               => 'SSS',
         'changelog'         => 'Değişiklikler',
-        'reviews'            => 'İncelemeler',
+        'reviews'            => 'Yorumlar',
     ],
 
     'installation' => [
@@ -73,8 +76,8 @@ return [
 
     'reviews' => [
         'button' => [
-            'add' => 'İnceleme Ekle'
+            'add' => 'Yorum Ekle'
         ],
-        'na' => 'Herhangi bir inceleme yok.'
+        'na' => 'Herhangi bir yorum yok.'
     ]
 ];

resources/views/common/companies/create.blade.php

@@ -46,6 +46,9 @@
         var text_no = '{{ trans('general.no') }}';
 
         $(document).ready(function(){
+            $('#enabled_1').trigger('click');
+            $('#company_name').focus();
+
             $("#default_currency").select2({
                 placeholder: "{{ trans('general.form.select.field', ['field' => trans_choice('general.currencies', 1)]) }}"
             });

resources/views/common/items/create.blade.php

@@ -98,10 +98,18 @@
 
         $('#name').focus();
 
-        $("#tax_id").select2({
+        $('#tax_id').select2({
             placeholder: {
                 id: '-1', // the value of the option
                 text: "{{ trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)]) }}"
+            },
+            escapeMarkup: function (markup) {
+                return markup;
+            },
+            language: {
+                noResults: function () {
+                    return '<span id="tax-add-new plus"><i class="fa fa-plus"></i> {{ trans('general.title.new', ['type' => trans_choice('general.tax_rates', 1)]) }}</span>';
+                }
             }
         });
 
@@ -116,6 +124,26 @@
         });
     });
 
+    $(document).on('click', '.select2-results__option.select2-results__message', function(e) {
+        tax_name = $('.select2-search__field').val();
+
+        $('body > .select2-container.select2-container--default.select2-container--open').remove();
+
+        $('#modal-create-tax').remove();
+
+        $.ajax({
+            url: '{{ url("modals/taxes/create") }}',
+            type: 'GET',
+            dataType: 'JSON',
+            data: {name: tax_name},
+            success: function(json) {
+                if (json['success']) {
+                    $('body').append(json['html']);
+                }
+            }
+        });
+    });
+
     $(document).on('click', '#button-category', function (e) {
         $('#modal-create-category').remove();
 

resources/views/common/items/edit.blade.php

@@ -87,10 +87,18 @@
             $("#sale_price").focusout();
             $("#purchase_price").focusout();*/
 
-            $("#tax_id").select2({
+            $('#tax_id').select2({
                 placeholder: {
                     id: '-1', // the value of the option
                     text: "{{ trans('general.form.select.field', ['field' => trans_choice('general.taxes', 1)]) }}"
+                },
+                escapeMarkup: function (markup) {
+                    return markup;
+                },
+                language: {
+                    noResults: function () {
+                        return '<span id="tax-add-new plus"><i class="fa fa-plus"></i> {{ trans('general.title.new', ['type' => trans_choice('general.tax_rates', 1)]) }}</span>';
+                    }
                 }
             });
 
@@ -129,5 +137,25 @@
                 });
             @endif
         });
+
+        $(document).on('click', '.select2-results__option.select2-results__message', function(e) {
+            tax_name = $('.select2-search__field').val();
+
+            $('body > .select2-container.select2-container--default.select2-container--open').remove();
+
+            $('#modal-create-tax').remove();
+
+            $.ajax({
+                url: '{{ url("modals/taxes/create") }}',
+                type: 'GET',
+                dataType: 'JSON',
+                data: {name: tax_name},
+                success: function(json) {
+                    if (json['success']) {
+                        $('body').append(json['html']);
+                    }
+                }
+            });
+        });
     </script>
 @endpush

resources/views/expenses/bills/create.blade.php

@@ -223,7 +223,7 @@
                 },
                 language: {
                     noResults: function () {
-                        return '<span id="tax-add-new"><i class="fa fa-plus"> {{ trans('general.title.new', ['type' => trans_choice('general.tax_rates', 1)]) }}</span>';
+                        return '<span id="tax-add-new"><i class="fa fa-plus-circle"></i> {{ trans('general.title.new', ['type' => trans_choice('general.tax_rates', 1)]) }}</span>';
                     }
                 }
             });

resources/views/expenses/bills/edit.blade.php

@@ -204,7 +204,7 @@
                 },
                 language: {
                     noResults: function () {
-                        return '<span id="tax-add-new"><i class="fa fa-plus"> {{ trans('general.title.new', ['type' => trans_choice('general.tax_rates', 1)]) }}</span>';
+                        return '<span id="tax-add-new"><i class="fa fa-plus"></i> {{ trans('general.title.new', ['type' => trans_choice('general.tax_rates', 1)]) }}</span>';
                     }
                 }
             });
@@ -314,7 +314,7 @@
                             },
                             language: {
                                 noResults: function () {
-                                    return '<span id="tax-add-new"><i class="fa fa-plus"> {{ trans('general.title.new', ['type' => trans_choice('general.tax_rates', 1)]) }}</span>';
+                                    return '<span id="tax-add-new"><i class="fa fa-plus-circle"> {{ trans('general.title.new', ['type' => trans_choice('general.tax_rates', 1)]) }}</span>';
                                 }
                             }
                         });

resources/views/expenses/bills/item.blade.php

@@ -18,7 +18,7 @@
     @stack('quantity_td_start')
     <td {{ $errors->has('item.' . $item_row . '.quantity') ? 'class="has-error"' : '' }}>
         @stack('quantity_input_start')
-        <input value="{{ empty($item) ? '' : $item->quantity }}" class="form-control text-center" required="required" name="item[{{ $item_row }}][quantity]" type="text" id="item-quantity-{{ $item_row }}">
+        <input value="{{ empty($item) ? 1 : $item->quantity }}" class="form-control text-center" required="required" name="item[{{ $item_row }}][quantity]" type="text" id="item-quantity-{{ $item_row }}">
         {!! $errors->first('item.' . $item_row . '.quantity', '<p class="help-block">:message</p>') !!}
         @stack('quantity_input_end')
     </td>

resources/views/expenses/bills/show.blade.php

@@ -29,7 +29,7 @@
                         <i class="fa fa-plus bg-blue"></i>
 
                         <div class="timeline-item">
-                            <h3 class="timeline-header">{{ trans('general.title.create', ['type' => trans_choice('general.bills', 1)]) }}</h3>
+                            <h3 class="timeline-header">{{ trans('bills.create_bill') }}</h3>
 
                             <div class="timeline-body">
                                 {{ trans_choice('general.statuses', 1) . ': ' . trans('bills.messages.status.created', ['date' => Date::parse($bill->created_at)->format($date_format)]) }}
@@ -44,7 +44,7 @@
                         <i class="fa fa-envelope bg-orange"></i>
 
                         <div class="timeline-item">
-                            <h3 class="timeline-header">{{ trans('general.title.send', ['type' => trans_choice('general.bills', 1)]) }}</h3>
+                            <h3 class="timeline-header">{{ trans('bills.receive_bill') }}</h3>
 
                             <div class="timeline-body">
                                 @if ($bill->status->code == 'draft')
@@ -63,7 +63,7 @@
                         <i class="fa fa-money bg-green"></i>
 
                         <div class="timeline-item">
-                            <h3 class="timeline-header">{{ trans('general.title.get', ['type' => trans('general.paid')]) }}</h3>
+                            <h3 class="timeline-header">{{ trans('bills.make_payment') }}</h3>
 
                             <div class="timeline-body">
                                 @if($bill->status->code != 'paid' && empty($bill->payments()->count()))

resources/views/incomes/invoices/create.blade.php

@@ -223,7 +223,7 @@
                 },
                 language: {
                     noResults: function () {
-                        return '<span id="tax-add-new"><i class="fa fa-plus"> {{ trans('general.title.new', ['type' => trans_choice('general.tax_rates', 1)]) }}</span>';
+                        return '<span id="tax-add-new plus"><i class="fa fa-plus-circle"></i> {{ trans('general.title.new', ['type' => trans_choice('general.tax_rates', 1)]) }}</span>';
                     }
                 }
             });
@@ -306,7 +306,7 @@
                             },
                             language: {
                                 noResults: function () {
-                                    return '<span id="tax-add-new"><i class="fa fa-plus"> {{ trans('general.title.new', ['type' => trans_choice('general.tax_rates', 1)]) }}</span>';
+                                    return '<span id="tax-add-new"><i class="fa fa-plus"></i> {{ trans('general.title.new', ['type' => trans_choice('general.tax_rates', 1)]) }}</span>';
                                 }
                             }
                         });
@@ -403,6 +403,7 @@
         $(document).on('click', '#cancel-discount', function(){
             $('#discount').val('');
 
+
             totalItem();
 
             $('a[rel=popover]').trigger('click');

resources/views/incomes/invoices/edit.blade.php

@@ -204,7 +204,7 @@
                 },
                 language: {
                     noResults: function () {
-                        return '<span id="tax-add-new"><i class="fa fa-plus"> {{ trans('general.title.new', ['type' => trans_choice('general.tax_rates', 1)]) }}</span>';
+                        return '<span id="tax-add-new"><i class="fa fa-plus"></i> {{ trans('general.title.new', ['type' => trans_choice('general.tax_rates', 1)]) }}</span>';
                     }
                 }
             });
@@ -314,7 +314,7 @@
                             },
                             language: {
                                 noResults: function () {
-                                    return '<span id="tax-add-new"><i class="fa fa-plus"> {{ trans('general.title.new', ['type' => trans_choice('general.tax_rates', 1)]) }}</span>';
+                                    return '<span id="tax-add-new"><i class="fa fa-plus-circle"></i> {{ trans('general.title.new', ['type' => trans_choice('general.tax_rates', 1)]) }}</span>';
                                 }
                             }
                         });

resources/views/incomes/invoices/item.blade.php

@@ -18,7 +18,7 @@
     @stack('quantity_td_start')
     <td {{ $errors->has('item.' . $item_row . '.quantity') ? 'class="has-error"' : '' }}>
         @stack('quantity_input_start')
-        <input value="{{ empty($item) ? '' : $item->quantity }}" class="form-control text-center" required="required" name="item[{{ $item_row }}][quantity]" type="text" id="item-quantity-{{ $item_row }}">
+        <input value="{{ empty($item) ? 1 : $item->quantity }}" class="form-control text-center" required="required" name="item[{{ $item_row }}][quantity]" type="text" id="item-quantity-{{ $item_row }}">
         {!! $errors->first('item.' . $item_row . '.quantity', '<p class="help-block">:message</p>') !!}
         @stack('quantity_input_end')
     </td>

resources/views/incomes/invoices/show.blade.php

@@ -29,7 +29,7 @@
                     <i class="fa fa-plus bg-blue"></i>
 
                     <div class="timeline-item">
-                        <h3 class="timeline-header">{{ trans('general.title.create', ['type' => trans_choice('general.invoices', 1)]) }}</h3>
+                        <h3 class="timeline-header">{{ trans('invoices.create_invoice') }}</h3>
 
                         <div class="timeline-body">
                             {{ trans_choice('general.statuses', 1) . ': ' . trans('invoices.messages.status.created', ['date' => Date::parse($invoice->created_at)->format($date_format)]) }}
@@ -44,7 +44,7 @@
                     <i class="fa fa-envelope bg-orange"></i>
 
                     <div class="timeline-item">
-                        <h3 class="timeline-header">{{ trans('general.title.send', ['type' => trans_choice('general.invoices', 1)]) }}</h3>
+                        <h3 class="timeline-header">{{ trans('invoices.send_invoice') }}</h3>
 
                         <div class="timeline-body">
                             @if ($invoice->status->code != 'sent' && $invoice->status->code != 'partial')
@@ -74,7 +74,7 @@
                     <i class="fa fa-money bg-green"></i>
 
                     <div class="timeline-item">
-                        <h3 class="timeline-header">{{ trans('general.title.get', ['type' => trans('general.paid')]) }}</h3>
+                        <h3 class="timeline-header">{{ trans('invoices.get_paid') }}</h3>
 
                         <div class="timeline-body">
                             @if($invoice->status->code != 'paid' && empty($invoice->payments()->count()))

resources/views/layouts/admin.blade.php

@@ -1,4 +1,4 @@
-<html lang="{{ setting('general.default_locale') }}">
+<html lang="{{ app()->getLocale() }}">
     @include('partials.admin.head')
 
     <body class="hold-transition {{ setting('general.admin_theme', 'skin-green-light') }} sidebar-mini fixed">

resources/views/layouts/auth.blade.php

@@ -1,4 +1,4 @@
-<html lang="{{ env('APP_LOCALE') }}">
+<html lang="{{ app()->getLocale() }}">
     @include('partials.auth.head')
 
     <body class="hold-transition login-page">

resources/views/layouts/bill.blade.php

@@ -1,4 +1,4 @@
-<html lang="{{ setting('general.default_locale') }}">
+<html lang="{{ app()->getLocale() }}">
     @include('partials.bill.head')
 
     <body onload="window.print();">

resources/views/layouts/customer.blade.php

@@ -1,4 +1,4 @@
-<html lang="{{ setting('general.default_locale') }}">
+<html lang="{{ app()->getLocale() }}">
     @include('partials.customer.head')
 
     <body class="hold-transition skin-green-light sidebar-mini fixed">

resources/views/layouts/invoice.blade.php

@@ -1,4 +1,4 @@
-<html lang="{{ setting('general.default_locale') }}">
+<html lang="{{ app()->getLocale() }}">
     @include('partials.invoice.head')
 
     <body onload="window.print();">

resources/views/layouts/link.blade.php

@@ -1,4 +1,4 @@
-<html lang="{{ setting('general.default_locale') }}">
+<html lang="{{ app()->getLocale() }}">
     @include('partials.link.head')
 
     <body class="hold-transition skin-green-light sidebar-mini fixed link">

resources/views/layouts/modules.blade.php

@@ -1,4 +1,4 @@
-<html lang="{{ setting('general.default_locale') }}">
+<html lang="{{ app()->getLocale() }}">
     @include('partials.modules.head')
 
     <body class="hold-transition {{ setting('general.admin_theme', 'skin-green-light') }} sidebar-mini fixed">

resources/views/layouts/print.blade.php

@@ -1,4 +1,4 @@
-<html lang="{{ setting('general.default_locale') }}">
+<html lang="{{ app()->getLocale() }}">
     @include('partials.admin.head')
 
     @push('css')

resources/views/layouts/wizard.blade.php

@@ -1,4 +1,4 @@
-<html lang="{{ setting('general.default_locale') }}">
+<html lang="{{ app()->getLocale() }}">
     @include('partials.wizard.head')
 
     <body class="hold-transition {{ setting('general.admin_theme', 'skin-green-light') }} sidebar-mini fixed">

resources/views/modules/home/index.blade.php

@@ -11,6 +11,7 @@
     @include('partials.modules.bar')
 
     <div class="row">
+        @if ($paid)
         <div class="col-md-12">
             <div class="content-header no-padding-left">
                 <h3>{{ trans('modules.top_paid') }}</h3>
@@ -24,7 +25,9 @@
                 @include('partials.modules.no_apps')
             @endif
         </div>
+        @endif
 
+        @if ($new)
         <div class="col-md-12">
             <div class="content-header no-padding-left">
                 <h3>{{ trans('modules.new') }}</h3>
@@ -38,7 +41,9 @@
                 @include('partials.modules.no_apps')
             @endif
         </div>
+        @endif
 
+        @if ($free)
         <div class="col-md-12">
             <div class="content-header no-padding-left">
                 <h3>{{ trans('modules.top_free') }}</h3>
@@ -52,5 +57,6 @@
                 @include('partials.modules.no_apps')
             @endif
         </div>
+        @endif
     </div>
 @endsection

resources/views/modules/item/show.blade.php

@@ -146,12 +146,14 @@
                                 @if ($module->price == '0.0000')
                                     {{ trans('modules.free') }}
                                 @else
+                                    {!! $module->price_prefix !!}
                                     @if (isset($module->special_price))
                                         <del>{{ $module->price }}</del>
                                         {{ $module->special_price }}
                                     @else
                                         {{ $module->price }}
                                     @endif
+                                    {!! $module->price_suffix !!}
                                 @endif
                             </div>
                         </div>
@@ -205,7 +207,7 @@
                             <tbody>
                                 @if ($module->vendor_name)
                                 <tr>
-                                    <th>{{ trans_choice('general.vendors', 1) }}</th>
+                                    <th>{{ trans_choice('general.developers', 1) }}</th>
                                     <td class="text-right"><a href="{{ url('apps/vendors/' . $module->vendor->slug) }}">{{ $module->vendor_name }}</a></td>
                                 </tr>
                                 @endif

resources/views/modules/token/create.blade.php

@@ -9,7 +9,7 @@
         <div class="box-body">
             <div class="col-md-12">
                 <div class="form-group required {{ $errors->has('api_token') ? 'has-error' : ''}}">
-                    {!! Form::label('sale_price', trans('modules.api_token'), ['class' => 'control-label']) !!}
+                    {!! Form::label('api_token', trans('modules.api_token'), ['class' => 'control-label']) !!}
                     <div class="input-group">
                         <span class="input-group-addon"><i class="fa fa-key"></i></span>
                         {!! Form::text('api_token', setting('general.api_token', null), ['class' => 'form-control', 'required' => 'required', 'placeholder' => trans('general.form.enter', ['field' => trans('modules.api_token')])]) !!}

resources/views/partials/modules/item.blade.php

@@ -44,12 +44,14 @@
                 @if ($module->price == '0.0000')
                     {{ trans('modules.free') }}
                 @else
+                    {!! $module->price_prefix !!}
                     @if (isset($module->special_price))
                         <del>{{ $module->price }}</del>
                         {{ $module->special_price }}
                     @else
                         {{ $module->price }}
                     @endif
+                    {!! $module->price_suffix !!}
                 @endif
             </div>
         </div>

resources/views/partials/modules/reviews.blade.php

@@ -1,60 +1,62 @@
 <div id="review-items">
     @foreach($reviews->data as $review)
-        <div class="post">
-            <div class="user-block">
-                <img class="img-circle img-bordered-sm" src="{{ $review->thumb }}" alt="{{ $review->author }}">
-                <span class="username">
-                  {{ $review->author }}
-                    <span class="pull-right">
-                      @for($i = 1; $i <= $review->rating; $i++)
-                            <i class="fa fa-star"></i>
-                        @endfor
-                        @for($i = $review->rating; $i < 5; $i++)
-                            <i class="fa fa-star-o"></i>
-                        @endfor
-                  </span>
+    <div class="post">
+        <div class="user-block">
+            <img class="img-circle img-bordered-sm" src="{{ $review->thumb }}" alt="{{ $review->author }}">
+            <span class="username">
+                {{ $review->author }}
+                <span class="pull-right">
+                    @for($i = 1; $i <= $review->rating; $i++)
+                    <i class="fa fa-star"></i>
+                    @endfor
+                    @for($i = $review->rating; $i < 5; $i++)
+                    <i class="fa fa-star-o"></i>
+                    @endfor
                 </span>
-                <span class="description">{{  \Carbon\Carbon::parse($review->created_at)->format('F d, Y') }}</span>
-            </div>
-            <!-- /.user-block -->
-            <p>
-                {!! nl2br($review->text) !!}
-            </p>
+            </span>
+            <span class="description">{{ Date::parse($review->created_at)->format($date_format) }}</span>
         </div>
+        <p>
+            {!! nl2br($review->text) !!}
+        </p>
+    </div>
     @endforeach
 
     @stack('pagination_start')
+
     @php
     $review_first_item = count($reviews->data) > 0 ? ($reviews->current_page - 1) * $reviews->per_page + 1 : null;
     $review_last_item = count($reviews->data) > 0 ? $review_first_item + count($reviews->data) - 1 : null;
     @endphp
+
     @if ($review_first_item)
         <div class="pull-left" style="margin-top: 7px;">
             <small>{{ trans('pagination.showing', ['first' => $review_first_item, 'last' => $review_last_item, 'total' => $reviews->total, 'type' => strtolower(trans('modules.tab.reviews'))]) }}</small>
         </div>
+
         <div class="pull-right">
             <ul class="pagination pagination-sm no-margin">
                 {{-- Previous Page Link --}}
                 @if ($reviews->current_page <= 1)
-                    <li class="disabled"><span>&laquo;</span></li>
+                <li class="disabled"><span>&laquo;</span></li>
                 @else
-                    <li><a href="{{ url(request()->path()) }}?page={{ $reviews->current_page - 1 }}" rel="prev">&laquo;</a></li>
+                <li><a href="{{ url(request()->path()) }}?page={{ $reviews->current_page - 1 }}" rel="prev">&laquo;</a></li>
                 @endif
 
                 {{-- Pagination Elements --}}
                 @for ($page = 1; $page <= $reviews->last_page; $page++)
                     @if ($page == $reviews->current_page)
-                        <li class="active"><span>{{ $page }}</span></li>
+                    <li class="active"><span>{{ $page }}</span></li>
                     @else
-                        <li><a href="{{ url(request()->path()) }}?page={{ $page }}" data-page="{{ $page }}">{{ $page }}</a></li>
+                    <li><a href="{{ url(request()->path()) }}?page={{ $page }}" data-page="{{ $page }}">{{ $page }}</a></li>
                     @endif
                 @endfor
 
                 {{-- Next Page Link --}}
                 @if ($reviews->current_page != 1)
-                    <li><a href="{{ url(request()->path()) }}?page={{ $reviews->current_page + 1 }}" rel="next">&raquo;</a></li>
+                <li><a href="{{ url(request()->path()) }}?page={{ $reviews->current_page + 1 }}" rel="next">&raquo;</a></li>
                 @else
-                    <li class="disabled"><span>&raquo;</span></li>
+                <li class="disabled"><span>&raquo;</span></li>
                 @endif
             </ul>
         </div>
@@ -65,4 +67,4 @@
     @endif
 
     @stack('pagination_end')
-    </div>
+</div>

resources/views/wizard/taxes/create.blade.php

@@ -4,6 +4,7 @@
     </td>
     <td>
         {{ Form::textGroup('rate', trans('currencies.rate'), 'money', ['required' => 'required'], null, '') }}
+        {{ Form::hidden('type', 'normal') }}
     </td>
     <td class="hidden-xs">
         {{ Form::radioGroup('enabled', trans('general.enabled'), trans('general.yes'), trans('general.no'), [], 'col-md-12 tax-enabled-radio-group') }}

resources/views/wizard/taxes/edit.blade.php

@@ -4,6 +4,7 @@
     </td>
     <td>
         {{ Form::textGroup('rate', trans('currencies.rate'), 'money', ['required' => 'required'], $item->rate, '') }}
+        {{ Form::hidden('type', 'normal') }}
     </td>
     <td class="hidden-xs">
         {{ Form::radioGroup('enabled', trans('general.enabled'), trans('general.yes'), trans('general.no'), [], 'col-md-12') }}