Merge branch 'master' of github.com:akaunting/akaunting into 2.1-dev
# Conflicts: # app/Http/Controllers/Common/Items.php # resources/views/modules/item/documentation.blade.php # resources/views/modules/item/show.blade.php # resources/views/partials/admin/header.blade.php # resources/views/purchases/bills/show.blade.php # resources/views/purchases/vendors/show.blade.php # resources/views/sales/customers/show.blade.php # resources/views/sales/invoices/show.blade.php # resources/views/wizard/companies/edit.blade.php # resources/views/wizard/currencies/index.blade.php # resources/views/wizard/finish/index.blade.php # resources/views/wizard/taxes/index.blade.php
This commit is contained in:
@ -1,5 +1,4 @@
|
||||
<html lang="{{ app()->getLocale() }}">
|
||||
|
||||
@include('partials.print.head')
|
||||
|
||||
<body onload="window.print();">
|
||||
@ -9,5 +8,4 @@
|
||||
|
||||
@stack('body_end')
|
||||
</body>
|
||||
|
||||
</html>
|
||||
|
Reference in New Issue
Block a user