Merge branch '1.3-dev' of github.com:akaunting/akaunting into tax-rate

2018-11-07 11:19:52 +03:00
parent fe9ce1c733 265c1757e2
commit 49112ce50f
25 changed files with 290 additions and 92 deletions
--- a/app/Http/Controllers/Expenses/Bills.php
+++ b/app/Http/Controllers/Expenses/Bills.php
@ -267,7 +267,7 @@ class Bills extends Controller

            $excel->sheet('bills', function ($sheet) use ($bills) {
                $sheet->fromModel($bills->makeHidden([
-                    'company_id', 'parent_id', 'created_at', 'updated_at', 'deleted_at', 'attachment', 'discount', 'items', 'histories', 'payments', 'totals', 'media'
+                    'company_id', 'parent_id', 'created_at', 'updated_at', 'deleted_at', 'attachment', 'discount', 'items', 'histories', 'payments', 'totals', 'media', 'paid'
                ]));
            });