From 9c9a85150f09820efb241374ba56bab96663f3d6 Mon Sep 17 00:00:00 2001
From: cuneytsenturk <cneytsenturk@gmail.com>
Date: Wed, 18 Jul 2018 16:04:33 +0300
Subject: [PATCH 01/13] close #423 Enhancement: Date pop-up barriers problem

---
 resources/views/banking/transfers/create.blade.php | 2 +-
 resources/views/banking/transfers/edit.blade.php   | 2 +-
 resources/views/expenses/bills/create.blade.php    | 4 ++--
 resources/views/expenses/bills/edit.blade.php      | 4 ++--
 resources/views/expenses/payments/create.blade.php | 2 +-
 resources/views/expenses/payments/edit.blade.php   | 2 +-
 resources/views/incomes/invoices/create.blade.php  | 4 ++--
 resources/views/incomes/invoices/edit.blade.php    | 4 ++--
 resources/views/incomes/revenues/create.blade.php  | 2 +-
 resources/views/incomes/revenues/edit.blade.php    | 2 +-
 resources/views/settings/settings/edit.blade.php   | 2 +-
 11 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/resources/views/banking/transfers/create.blade.php b/resources/views/banking/transfers/create.blade.php
index a5c6cd64f..ccf03fa75 100644
--- a/resources/views/banking/transfers/create.blade.php
+++ b/resources/views/banking/transfers/create.blade.php
@@ -14,7 +14,7 @@
 
             {{ Form::textGroup('amount', trans('general.amount'), 'money') }}
 
-            {{ Form::textGroup('transferred_at', trans('general.date'), 'calendar',['id' => 'transferred_at', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => ''], Date::now()->toDateString()) }}
+            {{ Form::textGroup('transferred_at', trans('general.date'), 'calendar',['id' => 'transferred_at', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => '', 'autocomplete' => 'off'], Date::now()->toDateString()) }}
 
             {{ Form::textareaGroup('description', trans('general.description')) }}
 
diff --git a/resources/views/banking/transfers/edit.blade.php b/resources/views/banking/transfers/edit.blade.php
index 11ebad5a1..31a25c5ea 100644
--- a/resources/views/banking/transfers/edit.blade.php
+++ b/resources/views/banking/transfers/edit.blade.php
@@ -18,7 +18,7 @@
 
             {{ Form::textGroup('amount', trans('general.amount'), 'money') }}
 
-            {{ Form::textGroup('transferred_at', trans('general.date'), 'calendar',['id' => 'transferred_at', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => 'yyyy-mm-dd']) }}
+            {{ Form::textGroup('transferred_at', trans('general.date'), 'calendar',['id' => 'transferred_at', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => 'yyyy-mm-dd', 'autocomplete' => 'off']) }}
 
             {{ Form::textareaGroup('description', trans('general.description')) }}
 
diff --git a/resources/views/expenses/bills/create.blade.php b/resources/views/expenses/bills/create.blade.php
index 6e713b3d0..cb81ab142 100644
--- a/resources/views/expenses/bills/create.blade.php
+++ b/resources/views/expenses/bills/create.blade.php
@@ -22,9 +22,9 @@
 
         {{ Form::selectGroup('currency_code', trans_choice('general.currencies', 1), 'exchange', $currencies, setting('general.default_currency')) }}
 
-        {{ Form::textGroup('billed_at', trans('bills.bill_date'), 'calendar',['id' => 'billed_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy/mm/dd\'', 'data-mask' => ''],Date::now()->toDateString()) }}
+        {{ Form::textGroup('billed_at', trans('bills.bill_date'), 'calendar',['id' => 'billed_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy/mm/dd\'', 'data-mask' => '', 'autocomplete' => 'off'],Date::now()->toDateString()) }}
 
-        {{ Form::textGroup('due_at', trans('bills.due_date'), 'calendar',['id' => 'due_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy/mm/dd\'', 'data-mask' => ''],Date::now()->toDateString()) }}
+        {{ Form::textGroup('due_at', trans('bills.due_date'), 'calendar',['id' => 'due_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy/mm/dd\'', 'data-mask' => '', 'autocomplete' => 'off'],Date::now()->toDateString()) }}
 
         {{ Form::textGroup('bill_number', trans('bills.bill_number'), 'file-text-o') }}
 
diff --git a/resources/views/expenses/bills/edit.blade.php b/resources/views/expenses/bills/edit.blade.php
index 861807e95..b774324f6 100644
--- a/resources/views/expenses/bills/edit.blade.php
+++ b/resources/views/expenses/bills/edit.blade.php
@@ -12,9 +12,9 @@
 
             {{ Form::selectGroup('currency_code', trans_choice('general.currencies', 1), 'exchange', $currencies) }}
 
-            {{ Form::textGroup('billed_at', trans('bills.bill_date'), 'calendar', ['id' => 'billed_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => ''], Date::parse($bill->billed_at)->toDateString()) }}
+            {{ Form::textGroup('billed_at', trans('bills.bill_date'), 'calendar', ['id' => 'billed_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => '', 'autocomplete' => 'off'], Date::parse($bill->billed_at)->toDateString()) }}
 
-            {{ Form::textGroup('due_at', trans('bills.due_date'), 'calendar', ['id' => 'due_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => ''], Date::parse($bill->due_at)->toDateString()) }}
+            {{ Form::textGroup('due_at', trans('bills.due_date'), 'calendar', ['id' => 'due_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => '', 'autocomplete' => 'off'], Date::parse($bill->due_at)->toDateString()) }}
 
             {{ Form::textGroup('bill_number', trans('bills.bill_number'), 'file-text-o') }}
 
diff --git a/resources/views/expenses/payments/create.blade.php b/resources/views/expenses/payments/create.blade.php
index 9e84470e4..c8992491b 100644
--- a/resources/views/expenses/payments/create.blade.php
+++ b/resources/views/expenses/payments/create.blade.php
@@ -8,7 +8,7 @@
         {!! Form::open(['url' => 'expenses/payments', 'files' => true, 'role' => 'form']) !!}
 
         <div class="box-body">
-            {{ Form::textGroup('paid_at', trans('general.date'), 'calendar',['id' => 'paid_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => ''], Date::now()->toDateString()) }}
+            {{ Form::textGroup('paid_at', trans('general.date'), 'calendar',['id' => 'paid_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => '', 'autocomplete' => 'off'], Date::now()->toDateString()) }}
 
             {!! Form::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!}
             {!! Form::hidden('currency_rate', '', ['id' => 'currency_rate']) !!}
diff --git a/resources/views/expenses/payments/edit.blade.php b/resources/views/expenses/payments/edit.blade.php
index af137ef2d..23430c845 100644
--- a/resources/views/expenses/payments/edit.blade.php
+++ b/resources/views/expenses/payments/edit.blade.php
@@ -25,7 +25,7 @@
         ]) !!}
 
         <div class="box-body">
-            {{ Form::textGroup('paid_at', trans('general.date'), 'calendar', ['id' => 'paid_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => ''], Date::parse($payment->paid_at)->toDateString()) }}
+            {{ Form::textGroup('paid_at', trans('general.date'), 'calendar', ['id' => 'paid_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => '', 'autocomplete' => 'off'], Date::parse($payment->paid_at)->toDateString()) }}
 
             {!! Form::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!}
             {!! Form::hidden('currency_rate', null, ['id' => 'currency_rate']) !!}
diff --git a/resources/views/incomes/invoices/create.blade.php b/resources/views/incomes/invoices/create.blade.php
index b4cd3eac8..89977fb7b 100644
--- a/resources/views/incomes/invoices/create.blade.php
+++ b/resources/views/incomes/invoices/create.blade.php
@@ -22,9 +22,9 @@
 
         {{ Form::selectGroup('currency_code', trans_choice('general.currencies', 1), 'exchange', $currencies, setting('general.default_currency')) }}
 
-        {{ Form::textGroup('invoiced_at', trans('invoices.invoice_date'), 'calendar',['id' => 'invoiced_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy/mm/dd\'', 'data-mask' => ''], Date::now()->toDateString()) }}
+        {{ Form::textGroup('invoiced_at', trans('invoices.invoice_date'), 'calendar',['id' => 'invoiced_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy/mm/dd\'', 'data-mask' => '', 'autocomplete' => 'off'], Date::now()->toDateString()) }}
 
-        {{ Form::textGroup('due_at', trans('invoices.due_date'), 'calendar',['id' => 'due_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy/mm/dd\'', 'data-mask' => '']) }}
+        {{ Form::textGroup('due_at', trans('invoices.due_date'), 'calendar',['id' => 'due_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy/mm/dd\'', 'data-mask' => '', 'autocomplete' => 'off']) }}
 
         {{ Form::textGroup('invoice_number', trans('invoices.invoice_number'), 'file-text-o', ['required' => 'required'], $number) }}
 
diff --git a/resources/views/incomes/invoices/edit.blade.php b/resources/views/incomes/invoices/edit.blade.php
index 9caa34a77..4bbf3d589 100644
--- a/resources/views/incomes/invoices/edit.blade.php
+++ b/resources/views/incomes/invoices/edit.blade.php
@@ -12,9 +12,9 @@
 
             {{ Form::selectGroup('currency_code', trans_choice('general.currencies', 1), 'exchange', $currencies) }}
 
-            {{ Form::textGroup('invoiced_at', trans('invoices.invoice_date'), 'calendar', ['id' => 'invoiced_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => ''], Date::parse($invoice->invoiced_at)->toDateString()) }}
+            {{ Form::textGroup('invoiced_at', trans('invoices.invoice_date'), 'calendar', ['id' => 'invoiced_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => '', 'autocomplete' => 'off'], Date::parse($invoice->invoiced_at)->toDateString()) }}
 
-            {{ Form::textGroup('due_at', trans('invoices.due_date'), 'calendar', ['id' => 'due_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => ''], Date::parse($invoice->due_at)->toDateString()) }}
+            {{ Form::textGroup('due_at', trans('invoices.due_date'), 'calendar', ['id' => 'due_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => '', 'autocomplete' => 'off'], Date::parse($invoice->due_at)->toDateString()) }}
 
             {{ Form::textGroup('invoice_number', trans('invoices.invoice_number'), 'file-text-o') }}
 
diff --git a/resources/views/incomes/revenues/create.blade.php b/resources/views/incomes/revenues/create.blade.php
index fe31e50af..c6c1dbf25 100644
--- a/resources/views/incomes/revenues/create.blade.php
+++ b/resources/views/incomes/revenues/create.blade.php
@@ -8,7 +8,7 @@
     {!! Form::open(['url' => 'incomes/revenues', 'files' => true, 'role' => 'form']) !!}
 
     <div class="box-body">
-        {{ Form::textGroup('paid_at', trans('general.date'), 'calendar',['id' => 'paid_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => ''], Date::now()->toDateString()) }}
+        {{ Form::textGroup('paid_at', trans('general.date'), 'calendar',['id' => 'paid_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => '', 'autocomplete' => 'off'], Date::now()->toDateString()) }}
 
         {!! Form::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!}
         {!! Form::hidden('currency_rate', '', ['id' => 'currency_rate']) !!}
diff --git a/resources/views/incomes/revenues/edit.blade.php b/resources/views/incomes/revenues/edit.blade.php
index ce05aa008..3172309ae 100644
--- a/resources/views/incomes/revenues/edit.blade.php
+++ b/resources/views/incomes/revenues/edit.blade.php
@@ -25,7 +25,7 @@
         ]) !!}
 
         <div class="box-body">
-            {{ Form::textGroup('paid_at', trans('general.date'), 'calendar', ['id' => 'paid_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => ''], Date::parse($revenue->paid_at)->toDateString()) }}
+            {{ Form::textGroup('paid_at', trans('general.date'), 'calendar', ['id' => 'paid_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => '', 'autocomplete' => 'off'], Date::parse($revenue->paid_at)->toDateString()) }}
 
             {!! Form::hidden('currency_code', $account_currency_code, ['id' => 'currency_code', 'class' => 'form-control', 'required' => 'required']) !!}
             {!! Form::hidden('currency_rate', null, ['id' => 'currency_rate']) !!}
diff --git a/resources/views/settings/settings/edit.blade.php b/resources/views/settings/settings/edit.blade.php
index 9cda125e6..d75a5e85e 100644
--- a/resources/views/settings/settings/edit.blade.php
+++ b/resources/views/settings/settings/edit.blade.php
@@ -42,7 +42,7 @@
                     </div>
 
                     <div class="tab-pane tab-margin" id="localisation">
-                        {{ Form::selectGroup('date_format', trans('settings.localisation.date.format'), 'calendar', $date_formats, null, []) }}
+                        {{ Form::selectGroup('date_format', trans('settings.localisation.date.format'), 'calendar', $date_formats, null, ['autocomplete' => 'off']) }}
 
                         {{ Form::selectGroup('date_separator', trans('settings.localisation.date.separator'), 'minus', $date_separators, null, []) }}
 

From 968c0b2016e88bf39e26f10209e320e3ce90eda6 Mon Sep 17 00:00:00 2001
From: cuneytsenturk <cneytsenturk@gmail.com>
Date: Wed, 18 Jul 2018 16:28:56 +0300
Subject: [PATCH 02/13] close #421 Fixed: Payments for expenses, wrong
 calculation error

---
 app/Http/Controllers/Expenses/Bills.php   | 22 +++++++++++++++++-----
 app/Http/Controllers/Incomes/Invoices.php |  2 +-
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/Expenses/Bills.php b/app/Http/Controllers/Expenses/Bills.php
index d314b4e90..5c7a99c66 100644
--- a/app/Http/Controllers/Expenses/Bills.php
+++ b/app/Http/Controllers/Expenses/Bills.php
@@ -66,9 +66,15 @@ class Bills extends Controller
         $paid = 0;
 
         foreach ($bill->payments as $item) {
-            $item->default_currency_code = $bill->currency_code;
+            $amount = $item->amount;
 
-            $paid += $item->getDynamicConvertedAmount();
+            if ($bill->currency_code != $item->currency_code) {
+                $item->default_currency_code = $bill->currency_code;
+
+                $amount = $item->getDynamicConvertedAmount();
+            }
+
+            $paid += $amount;
         }
 
         $bill->paid = $paid;
@@ -607,7 +613,7 @@ class Bills extends Controller
         for ($i = 0; $i < $currency->precision; $i++) {
             $multiplier *= 10;
         }
-        
+
         $amount *=  $multiplier;
         $total_amount *=  $multiplier;
 
@@ -713,9 +719,15 @@ class Bills extends Controller
         $paid = 0;
 
         foreach ($bill->payments as $item) {
-            $item->default_currency_code = $bill->currency_code;
+            $amount = $item->amount;
 
-            $paid += $item->getDynamicConvertedAmount();
+            if ($bill->currency_code != $item->currency_code) {
+                $item->default_currency_code = $bill->currency_code;
+
+                $amount = $item->getDynamicConvertedAmount();
+            }
+
+            $paid += $amount;
         }
 
         $bill->paid = $paid;
diff --git a/app/Http/Controllers/Incomes/Invoices.php b/app/Http/Controllers/Incomes/Invoices.php
index d8849096f..250ee3012 100644
--- a/app/Http/Controllers/Incomes/Invoices.php
+++ b/app/Http/Controllers/Incomes/Invoices.php
@@ -691,7 +691,7 @@ class Invoices extends Controller
             $request['payment_method'] = setting('general.default_payment_method', 'offlinepayment.cash.1');
             $request['currency_code'] = $invoice->currency_code;
             $request['amount'] = $amount;
-            $request['paid_at'] = Date::now();
+            $request['paid_at'] = Date::now()->format('Y-m-d');
             $request['_token'] = csrf_token();
 
             $this->payment($request);

From 14b925fbacecf49e59e2acf5857ac0ac8363da39 Mon Sep 17 00:00:00 2001
From: cuneytsenturk <cneytsenturk@gmail.com>
Date: Wed, 18 Jul 2018 17:11:01 +0300
Subject: [PATCH 03/13] close #413 Fixed: Currency symbol displays as ? when
 mailing invoice pdf or downloading invoice pdf

---
 resources/views/partials/bill/head.blade.php    | 7 +++++++
 resources/views/partials/invoice/head.blade.php | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/resources/views/partials/bill/head.blade.php b/resources/views/partials/bill/head.blade.php
index 9d6e47c0a..6383d3b36 100644
--- a/resources/views/partials/bill/head.blade.php
+++ b/resources/views/partials/bill/head.blade.php
@@ -3,6 +3,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <!-- Tell the browser to be responsive to screen width -->
     <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 
     <title>@yield('title') - @setting('general.company_name')</title>
 
@@ -20,6 +21,12 @@
     <!-- App style -->
     <link rel="stylesheet" href="{{ asset('public/css/app.css') }}">
 
+    <style type="text/css">
+        * {
+            font-family: "DejaVu Sans Mono", monospace;
+        }
+    </style>
+
     @stack('css')
 
     @stack('stylesheet')
diff --git a/resources/views/partials/invoice/head.blade.php b/resources/views/partials/invoice/head.blade.php
index 9d6e47c0a..6383d3b36 100644
--- a/resources/views/partials/invoice/head.blade.php
+++ b/resources/views/partials/invoice/head.blade.php
@@ -3,6 +3,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <!-- Tell the browser to be responsive to screen width -->
     <meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 
     <title>@yield('title') - @setting('general.company_name')</title>
 
@@ -20,6 +21,12 @@
     <!-- App style -->
     <link rel="stylesheet" href="{{ asset('public/css/app.css') }}">
 
+    <style type="text/css">
+        * {
+            font-family: "DejaVu Sans Mono", monospace;
+        }
+    </style>
+
     @stack('css')
 
     @stack('stylesheet')

From 67228694a14ff297bac0b7f6c0c46067c9b282ef Mon Sep 17 00:00:00 2001
From: cuneytsenturk <cneytsenturk@gmail.com>
Date: Wed, 18 Jul 2018 17:21:08 +0300
Subject: [PATCH 04/13] invoice mark paid show add payment price

---
 app/Http/Controllers/Incomes/Invoices.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Incomes/Invoices.php b/app/Http/Controllers/Incomes/Invoices.php
index 250ee3012..044a2c670 100644
--- a/app/Http/Controllers/Incomes/Invoices.php
+++ b/app/Http/Controllers/Incomes/Invoices.php
@@ -675,9 +675,15 @@ class Invoices extends Controller
         $paid = 0;
 
         foreach ($invoice->payments as $item) {
-            $item->default_currency_code = $invoice->currency_code;
+            $amount = $item->amount;
 
-            $paid += $item->getDynamicConvertedAmount();
+            if ($invoice->currency_code != $item->currency_code) {
+                $item->default_currency_code = $invoice->currency_code;
+
+                $amount = $item->getDynamicConvertedAmount();
+            }
+
+            $paid += $amount;
         }
 
         $amount = $invoice->amount - $paid;

From 23132d848cf3e70f78fc87c8e7ea881c89931e95 Mon Sep 17 00:00:00 2001
From: cuneytsenturk <cneytsenturk@gmail.com>
Date: Wed, 18 Jul 2018 17:33:30 +0300
Subject: [PATCH 05/13] Invoice and bill add payment change paid at format and
 add language support.

---
 resources/views/expenses/bills/show.blade.php   | 6 ++++--
 resources/views/incomes/invoices/show.blade.php | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/resources/views/expenses/bills/show.blade.php b/resources/views/expenses/bills/show.blade.php
index 57b78fd71..9355e93be 100644
--- a/resources/views/expenses/bills/show.blade.php
+++ b/resources/views/expenses/bills/show.blade.php
@@ -334,7 +334,7 @@
                 html += '                   {!! Form::label('paid_at', trans('general.date'), ['class' => 'control-label']) !!}';
                 html += '                   <div class="input-group">';
                 html += '                       <div class="input-group-addon"><i class="fa fa-calendar"></i></div>';
-                html += '                       {!! Form::text('paid_at', \Date::now()->toDateString(), ['id' => 'paid_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => '']) !!}';
+                html += '                       {!! Form::text('paid_at', \Date::now()->toDateString(), ['id' => 'paid_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => '', 'autocomplete' => 'off']) !!}';
                 html += '                   </div>';
                 html += '               </div>';
                 html += '               <div class="form-group col-md-6 required">';
@@ -391,7 +391,9 @@
 
                 $('#paid_at').datepicker({
                     format: 'yyyy-mm-dd',
-                    autoclose: true
+                    weekStart: 1,
+                    autoclose: true,
+                    language: '{{ language()->getShortCode() }}'
                 });
 
                 $("#account_id").select2({
diff --git a/resources/views/incomes/invoices/show.blade.php b/resources/views/incomes/invoices/show.blade.php
index a99ff9fb0..f4e0ea9d6 100644
--- a/resources/views/incomes/invoices/show.blade.php
+++ b/resources/views/incomes/invoices/show.blade.php
@@ -347,7 +347,7 @@
                 html += '                   {!! Form::label('paid_at', trans('general.date'), ['class' => 'control-label']) !!}';
                 html += '                   <div class="input-group">';
                 html += '                       <div class="input-group-addon"><i class="fa fa-calendar"></i></div>';
-                html += '                       {!! Form::text('paid_at', \Carbon\Carbon::now()->toDateString(), ['id' => 'paid_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => '']) !!}';
+                html += '                       {!! Form::text('paid_at', \Carbon\Carbon::now()->toDateString(), ['id' => 'paid_at', 'class' => 'form-control', 'required' => 'required', 'data-inputmask' => '\'alias\': \'yyyy-mm-dd\'', 'data-mask' => '', 'autocomplete' => 'off']) !!}';
                 html += '                   </div>';
                 html += '               </div>';
                 html += '               <div class="form-group col-md-6 required">';
@@ -404,7 +404,9 @@
 
                 $('#paid_at').datepicker({
                     format: 'yyyy-mm-dd',
-                    autoclose: true
+                    weekStart: 1,
+                    autoclose: true,
+                    language: '{{ language()->getShortCode() }}'
                 });
 
                 $("#account_id").select2({

From 2a1252e6fcee320578c85a87eb4b0c0b8a444b2a Mon Sep 17 00:00:00 2001
From: cuneytsenturk <cneytsenturk@gmail.com>
Date: Wed, 18 Jul 2018 17:54:50 +0300
Subject: [PATCH 06/13] close #422 Added: Notification language text

---
 resources/lang/en-GB/notifications.php               | 11 +++++++++++
 resources/views/vendor/notifications/email.blade.php |  9 ++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 resources/lang/en-GB/notifications.php

diff --git a/resources/lang/en-GB/notifications.php b/resources/lang/en-GB/notifications.php
new file mode 100644
index 000000000..55bf2f46b
--- /dev/null
+++ b/resources/lang/en-GB/notifications.php
@@ -0,0 +1,11 @@
+<?php
+
+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)',
+
+];
diff --git a/resources/views/vendor/notifications/email.blade.php b/resources/views/vendor/notifications/email.blade.php
index d91eb8bb4..e572533f3 100644
--- a/resources/views/vendor/notifications/email.blade.php
+++ b/resources/views/vendor/notifications/email.blade.php
@@ -4,9 +4,9 @@
 # {{ $greeting }}
 @else
 @if ($level == 'error')
-# Whoops!
+# {{ trans('notifications.whoops') }}
 @else
-# Hello!
+# {{ trans('notifications.hello') }}
 @endif
 @endif
 
@@ -45,14 +45,13 @@
 @if (! empty($salutation))
 {{ $salutation }}
 @else
-Regards,<br>{{ setting('general.company_name', config('app.name')) }}
+{!! trans('notifications.salutation', ['company_name' => setting('general.company_name', config('app.name'))]) !!}
 @endif
 
 <!-- Subcopy -->
 @isset($actionText)
 @component('mail::subcopy')
-If you’re having trouble clicking the "{{ $actionText }}" button, copy and paste the URL below
-into your web browser: [{{ $actionUrl }}]({{ $actionUrl }})
+{!! trans('notifications.subcopy', ['text' => $actionText, 'url' => $actionUrl]) !!}
 @endcomponent
 @endisset
 @endcomponent

From afae3498f581df2b24964855fa46526102abfc38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Berkay=20Gu=CC=88re?= <bgure@hotmail.com.tr>
Date: Wed, 18 Jul 2018 21:37:12 +0300
Subject: [PATCH 07/13] Fixes mysqlVersion() if not using mysql display n/a

---
 app/Utilities/Info.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/Utilities/Info.php b/app/Utilities/Info.php
index db5211c34..b44813ab2 100644
--- a/app/Utilities/Info.php
+++ b/app/Utilities/Info.php
@@ -39,6 +39,11 @@ class Info
 
     public static function mysqlVersion()
     {
-        return DB::selectOne('select version() as mversion')->mversion;
+        if(env('DB_CONNECTION') === 'mysql')
+        {
+            return DB::selectOne('select version() as mversion')->mversion;
+        }
+
+        return "N/A";
     }
 }
\ No newline at end of file

From 4dea986ecbd834f92daf3f44ffad7da6b27f7390 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Berkay=20Gu=CC=88re?= <bgure@hotmail.com.tr>
Date: Wed, 18 Jul 2018 22:10:30 +0300
Subject: [PATCH 08/13] Fixes some sqlite issues

---
 .../2017_12_09_000000_add_currency_columns.php | 12 +++++++-----
 ...0000_add_category_column_invoices_bills.php | 18 ++++++++++++++----
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/database/migrations/2017_12_09_000000_add_currency_columns.php b/database/migrations/2017_12_09_000000_add_currency_columns.php
index 0da22dcef..1d6aeef23 100644
--- a/database/migrations/2017_12_09_000000_add_currency_columns.php
+++ b/database/migrations/2017_12_09_000000_add_currency_columns.php
@@ -28,11 +28,13 @@ class AddCurrencyColumns extends Migration
     public function down()
     {
         Schema::table('currencies', function ($table) {
-            $table->dropColumn('precision');
-            $table->dropColumn('symbol');
-            $table->dropColumn('symbol_first');
-            $table->dropColumn('decimal_mark');
-            $table->dropColumn('thousands_separator');
+            $table->dropColumn([
+                'precision',
+                'symbol',
+                'symbol_first',
+                'decimal_mark',
+                'thousands_separator',
+            ]);
         });
     }
 }
diff --git a/database/migrations/2018_04_23_000000_add_category_column_invoices_bills.php b/database/migrations/2018_04_23_000000_add_category_column_invoices_bills.php
index d32668d85..999c37c78 100644
--- a/database/migrations/2018_04_23_000000_add_category_column_invoices_bills.php
+++ b/database/migrations/2018_04_23_000000_add_category_column_invoices_bills.php
@@ -11,12 +11,22 @@ class AddCategoryColumnInvoicesBills extends Migration
      */
     public function up()
     {
-        Schema::table('invoices', function ($table) {
-            $table->integer('category_id');
+        $driver = Schema::connection($this->getConnection())->getConnection()->getDriverName();
+
+        Schema::table('invoices', function ($table) use($driver) {
+            if($driver === 'sqlite'){
+                $table->integer('category_id')->default();
+            }else{
+                $table->integer('category_id');
+            }
         });
 
-        Schema::table('bills', function ($table) {
-            $table->integer('category_id');
+        Schema::table('bills', function ($table) use($driver) {
+            if($driver === 'sqlite'){
+                $table->integer('category_id')->default();
+            }else{
+                $table->integer('category_id');
+            }
         });
     }
 

From 5a4bed7e0485cc1b0df3c1ee8f2314929d31d5f2 Mon Sep 17 00:00:00 2001
From: cuneytsenturk <cneytsenturk@gmail.com>
Date: Thu, 19 Jul 2018 13:01:11 +0300
Subject: [PATCH 09/13] close #266 Fixed: CSS fault with dashboard date picker
 (Firefox)

---
 public/css/app.css                               | 11 +++++++++++
 resources/views/partials/admin/head.blade.php    |  2 +-
 resources/views/partials/auth/head.blade.php     |  2 +-
 resources/views/partials/bill/head.blade.php     |  2 +-
 resources/views/partials/customer/head.blade.php |  2 +-
 resources/views/partials/invoice/head.blade.php  |  2 +-
 resources/views/partials/modules/head.blade.php  |  2 +-
 7 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/public/css/app.css b/public/css/app.css
index e618ec239..86e7ca968 100644
--- a/public/css/app.css
+++ b/public/css/app.css
@@ -662,3 +662,14 @@ input[type="number"] {
     border-bottom: 20px solid transparent;
     border-left: 20px solid #ecf0f5;
 }
+
+@-moz-document url-prefix() {
+    .show-calendar .calendar-table .table-condensed > tbody > tr > td,
+    .show-calendar .calendar-table .table-condensed > tbody > tr > th,
+    .show-calendar .calendar-table .table-condensed > tfoot > tr > td,
+    .show-calendar .calendar-table .table-condensed > tfoot > tr > th,
+    .show-calendar .calendar-table .table-condensed > thead > tr > td,
+    .show-calendar .calendar-table .table-condensed > thead > tr > th  {
+        padding: 0;
+    }
+}
diff --git a/resources/views/partials/admin/head.blade.php b/resources/views/partials/admin/head.blade.php
index 27b7ca007..01f80e77f 100644
--- a/resources/views/partials/admin/head.blade.php
+++ b/resources/views/partials/admin/head.blade.php
@@ -24,7 +24,7 @@
     <!-- Select2 -->
     <link rel="stylesheet" href="{{ asset('vendor/almasaeed2010/adminlte/plugins/select2/select2.min.css') }}">
     <!-- App style -->
-    <link rel="stylesheet" href="{{ asset('public/css/app.css?v=1.2') }}">
+    <link rel="stylesheet" href="{{ asset('public/css/app.css?v=1.2.12') }}">
     <link rel="stylesheet" href="{{ asset('public/css/akaunting-green.css?v=1.2') }}">
     
     <link rel="shortcut icon" href="{{ asset('public/img/favicon.ico') }}">
diff --git a/resources/views/partials/auth/head.blade.php b/resources/views/partials/auth/head.blade.php
index 1293b53a6..96242dae6 100644
--- a/resources/views/partials/auth/head.blade.php
+++ b/resources/views/partials/auth/head.blade.php
@@ -17,7 +17,7 @@
     <!-- AdminLTE Skins -->
     <link rel="stylesheet" href="{{ asset('vendor/almasaeed2010/adminlte/dist/css/skins/skin-green-light.min.css') }}">
     <!-- App style -->
-    <link rel="stylesheet" href="{{ asset('public/css/app.css') }}">
+    <link rel="stylesheet" href="{{ asset('public/css/app.css?v=1.2.12') }}">
     <link rel="stylesheet" href="{{ asset('public/css/akaunting-green.css') }}">
     
     <link rel="shortcut icon" href="{{ asset('public/img/favicon.ico') }}">
diff --git a/resources/views/partials/bill/head.blade.php b/resources/views/partials/bill/head.blade.php
index 6383d3b36..b97f6c543 100644
--- a/resources/views/partials/bill/head.blade.php
+++ b/resources/views/partials/bill/head.blade.php
@@ -19,7 +19,7 @@
          folder instead of downloading all of them to reduce the load. -->
     <link rel="stylesheet" href="{{ asset('vendor/almasaeed2010/adminlte/dist/css/skins/_all-skins.min.css') }}">
     <!-- App style -->
-    <link rel="stylesheet" href="{{ asset('public/css/app.css') }}">
+    <link rel="stylesheet" href="{{ asset('public/css/app.css?v=1.2.12') }}">
 
     <style type="text/css">
         * {
diff --git a/resources/views/partials/customer/head.blade.php b/resources/views/partials/customer/head.blade.php
index c2d6769f8..f0de984ec 100644
--- a/resources/views/partials/customer/head.blade.php
+++ b/resources/views/partials/customer/head.blade.php
@@ -26,7 +26,7 @@
     <!-- Select2 -->
     <link rel="stylesheet" href="{{ asset('vendor/almasaeed2010/adminlte/plugins/select2/select2.min.css') }}">
     <!-- App style -->
-    <link rel="stylesheet" href="{{ asset('public/css/app.css?v=1.2') }}">
+    <link rel="stylesheet" href="{{ asset('public/css/app.css?v=1.2.12') }}">
     <link rel="stylesheet" href="{{ asset('public/css/akaunting-green.css?v=1.2') }}">
     
     <link rel="shortcut icon" href="{{ asset('public/img/favicon.ico') }}">
diff --git a/resources/views/partials/invoice/head.blade.php b/resources/views/partials/invoice/head.blade.php
index 6383d3b36..b97f6c543 100644
--- a/resources/views/partials/invoice/head.blade.php
+++ b/resources/views/partials/invoice/head.blade.php
@@ -19,7 +19,7 @@
          folder instead of downloading all of them to reduce the load. -->
     <link rel="stylesheet" href="{{ asset('vendor/almasaeed2010/adminlte/dist/css/skins/_all-skins.min.css') }}">
     <!-- App style -->
-    <link rel="stylesheet" href="{{ asset('public/css/app.css') }}">
+    <link rel="stylesheet" href="{{ asset('public/css/app.css?v=1.2.12') }}">
 
     <style type="text/css">
         * {
diff --git a/resources/views/partials/modules/head.blade.php b/resources/views/partials/modules/head.blade.php
index f83c9ddea..68a46ae1b 100644
--- a/resources/views/partials/modules/head.blade.php
+++ b/resources/views/partials/modules/head.blade.php
@@ -24,7 +24,7 @@
     <!-- Select2 -->
     <link rel="stylesheet" href="{{ asset('vendor/almasaeed2010/adminlte/plugins/select2/select2.min.css') }}">
     <!-- App style -->
-    <link rel="stylesheet" href="{{ asset('public/css/app.css?v=1.0.7') }}">
+    <link rel="stylesheet" href="{{ asset('public/css/app.css?v=1.2.12') }}">
     <link rel="stylesheet" href="{{ asset('public/css/akaunting-green.css?v=1.0.7') }}">
     <link rel="stylesheet" href="{{ asset('public/css/modules.css?v=1.0.7') }}">
     

From 4c497c3f60ca7ad8f385fcd5268f80ddd24503f1 Mon Sep 17 00:00:00 2001
From: cuneytsenturk <cneytsenturk@gmail.com>
Date: Thu, 19 Jul 2018 14:54:23 +0300
Subject: [PATCH 10/13] close #420 Fixed: Reports - Income Summary - Paid Tab -
 Not adding income categories

---
 app/Http/Controllers/Reports/ExpenseSummary.php       | 6 ++++++
 app/Http/Controllers/Reports/IncomeExpenseSummary.php | 6 ++++++
 app/Http/Controllers/Reports/IncomeSummary.php        | 6 ++++++
 app/Http/Controllers/Reports/ProfitLoss.php           | 6 ++++++
 app/Http/Controllers/Reports/TaxSummary.php           | 6 ++++++
 5 files changed, 30 insertions(+)

diff --git a/app/Http/Controllers/Reports/ExpenseSummary.php b/app/Http/Controllers/Reports/ExpenseSummary.php
index a72c03ee1..ff19da333 100644
--- a/app/Http/Controllers/Reports/ExpenseSummary.php
+++ b/app/Http/Controllers/Reports/ExpenseSummary.php
@@ -101,6 +101,12 @@ class ExpenseSummary extends Controller
     private function setAmount(&$graph, &$totals, &$expenses, $items, $type, $date_field)
     {
         foreach ($items as $item) {
+            if ($item['table'] == 'bill_payments') {
+                $bill = $item->bill;
+
+                $item->category_id = $bill->category_id;
+            }
+
             $date = Date::parse($item->$date_field)->format('F');
 
             if (!isset($expenses[$item->category_id])) {
diff --git a/app/Http/Controllers/Reports/IncomeExpenseSummary.php b/app/Http/Controllers/Reports/IncomeExpenseSummary.php
index c8a65b73e..b09cc7dc1 100644
--- a/app/Http/Controllers/Reports/IncomeExpenseSummary.php
+++ b/app/Http/Controllers/Reports/IncomeExpenseSummary.php
@@ -138,6 +138,12 @@ class IncomeExpenseSummary extends Controller
     private function setAmount(&$graph, &$totals, &$compares, $items, $type, $date_field)
     {
         foreach ($items as $item) {
+            if ($item['table'] == 'bill_payments' || $item['table'] == 'invoice_payments') {
+                $type_item = $item->$type;
+
+                $item->category_id = $type_item->category_id;
+            }
+
             $date = Date::parse($item->$date_field)->format('F');
 
             $group = (($type == 'invoice') || ($type == 'revenue')) ? 'income' : 'expense';
diff --git a/app/Http/Controllers/Reports/IncomeSummary.php b/app/Http/Controllers/Reports/IncomeSummary.php
index 16f05aa73..0d72c6ecc 100644
--- a/app/Http/Controllers/Reports/IncomeSummary.php
+++ b/app/Http/Controllers/Reports/IncomeSummary.php
@@ -101,6 +101,12 @@ class IncomeSummary extends Controller
     private function setAmount(&$graph, &$totals, &$incomes, $items, $type, $date_field)
     {
         foreach ($items as $item) {
+            if ($item['table'] == 'invoice_payments') {
+                $invoice = $item->invoice;
+
+                $item->category_id = $invoice->category_id;
+            }
+
             $date = Date::parse($item->$date_field)->format('F');
 
             if (!isset($incomes[$item->category_id])) {
diff --git a/app/Http/Controllers/Reports/ProfitLoss.php b/app/Http/Controllers/Reports/ProfitLoss.php
index 1726aeb18..96cecddb1 100644
--- a/app/Http/Controllers/Reports/ProfitLoss.php
+++ b/app/Http/Controllers/Reports/ProfitLoss.php
@@ -155,6 +155,12 @@ class ProfitLoss extends Controller
     private function setAmount(&$totals, &$compares, $items, $type, $date_field)
     {
         foreach ($items as $item) {
+            if ($item['table'] == 'bill_payments' || $item['table'] == 'invoice_payments') {
+                $type_item = $item->$type;
+
+                $item->category_id = $type_item->category_id;
+            }
+
             $date = Date::parse($item->$date_field)->quarter;
 
             $group = (($type == 'invoice') || ($type == 'revenue')) ? 'income' : 'expense';
diff --git a/app/Http/Controllers/Reports/TaxSummary.php b/app/Http/Controllers/Reports/TaxSummary.php
index 45e74ab60..5638c05e6 100644
--- a/app/Http/Controllers/Reports/TaxSummary.php
+++ b/app/Http/Controllers/Reports/TaxSummary.php
@@ -103,6 +103,12 @@ class TaxSummary extends Controller
     private function setAmount(&$items, &$totals, $rows, $type, $date_field)
     {
         foreach ($rows as $row) {
+            if ($row['table'] == 'bill_payments' || $row['table'] == 'invoice_payments') {
+                $type_row = $row->$type;
+
+                $row->category_id = $type_row->category_id;
+            }
+
             $date = Date::parse($row->$date_field)->format('M');
 
             if ($date_field == 'paid_at') {

From efbd17f5fe8ad2e85e6c7dbfcd9635cfd1dd5ca7 Mon Sep 17 00:00:00 2001
From: denisdulici <denisdulici@gmail.com>
Date: Fri, 20 Jul 2018 14:22:37 +0300
Subject: [PATCH 11/13] wrong redirection in items out of stock read

---
 app/Http/Controllers/Auth/Users.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Controllers/Auth/Users.php b/app/Http/Controllers/Auth/Users.php
index 3f5016311..f3d6a6926 100644
--- a/app/Http/Controllers/Auth/Users.php
+++ b/app/Http/Controllers/Auth/Users.php
@@ -282,7 +282,7 @@ class Users extends Controller
         }
 
         // Redirect to items
-        return redirect('items/items');
+        return redirect('common/items');
     }
 
     public function autocomplete(ARequest $request)

From 67b4a6d50214b6d5054915954f6adeb6d3e5ceeb Mon Sep 17 00:00:00 2001
From: denisdulici <denisdulici@gmail.com>
Date: Fri, 20 Jul 2018 16:20:53 +0300
Subject: [PATCH 12/13] fixed #430

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

diff --git a/resources/views/incomes/revenues/create.blade.php b/resources/views/incomes/revenues/create.blade.php
index c6c1dbf25..b378d9c7d 100644
--- a/resources/views/incomes/revenues/create.blade.php
+++ b/resources/views/incomes/revenues/create.blade.php
@@ -19,7 +19,7 @@
             {!! Form::label('account_id', trans_choice('general.accounts', 1), ['class' => 'control-label']) !!}
             <div class="input-group">
                 <div class="input-group-addon"><i class="fa fa-university"></i></div>
-                {!! Form::select('account_id', $accounts, setting('general.accounts', 1), array_merge(['class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.accounts', 1)])])) !!}
+                {!! Form::select('account_id', $accounts, setting('general.default_account'), array_merge(['class' => 'form-control', 'placeholder' => trans('general.form.select.field', ['field' => trans_choice('general.accounts', 1)])])) !!}
                 <div class="input-group-append">
                     {!! Form::text('currency', $account_currency_code, ['id' => 'currency', 'class' => 'form-control', 'required' => 'required', 'disabled' => 'disabled']) !!}
                 </div>

From 1e4fe8873543a9f316bee674b503eb1fe7727908 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Berkay=20Gu=CC=88re?= <bgure@hotmail.com.tr>
Date: Wed, 25 Jul 2018 09:16:22 +0300
Subject: [PATCH 13/13] Adds default for category_id bills and invoices tables.

---
 ...0000_add_category_column_invoices_bills.php | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/database/migrations/2018_04_23_000000_add_category_column_invoices_bills.php b/database/migrations/2018_04_23_000000_add_category_column_invoices_bills.php
index 999c37c78..24c9eb6c2 100644
--- a/database/migrations/2018_04_23_000000_add_category_column_invoices_bills.php
+++ b/database/migrations/2018_04_23_000000_add_category_column_invoices_bills.php
@@ -11,22 +11,12 @@ class AddCategoryColumnInvoicesBills extends Migration
      */
     public function up()
     {
-        $driver = Schema::connection($this->getConnection())->getConnection()->getDriverName();
-
-        Schema::table('invoices', function ($table) use($driver) {
-            if($driver === 'sqlite'){
-                $table->integer('category_id')->default();
-            }else{
-                $table->integer('category_id');
-            }
+        Schema::table('invoices', function ($table) {
+            $table->integer('category_id')->default();
         });
 
-        Schema::table('bills', function ($table) use($driver) {
-            if($driver === 'sqlite'){
-                $table->integer('category_id')->default();
-            }else{
-                $table->integer('category_id');
-            }
+        Schema::table('bills', function ($table) {
+            $table->integer('category_id')->default();
         });
     }