shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:akaunting/akaunting

Browse Source
This commit is contained in:
Cüneyt Şentürk 2021-04-26 18:37:27 +03:00
commit 178eeece18
14 changed files with 42 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Abstracts/Report.php
View File

@ -410,7 +410,7 @@ abstract class Report
public function getUrl($action = 'print')
{
$url = 'common/reports/' . $this->model->id . '/' . $action;
$url = company_id() . '/common/reports/' . $this->model->id . '/' . $action;
$search = request('search');

17
app/Console/Commands/FinishUpdate.php
View File

@ -3,7 +3,6 @@
namespace App\Console\Commands;
use App\Events\Install\UpdateFinished;
use App\Models\Common\Company;
use Illuminate\Console\Command;
class FinishUpdate extends Command
@ -48,16 +47,18 @@ class FinishUpdate extends Command
throw new \Exception(trans('modules.errors.finish', ['module' => $alias]));
}
// Set locale for modules
if ($alias != 'core') {
$company = Company::find($company_id);
$company = company($company_id);
if (!empty($company->locale)) {
app()->setLocale($company->locale);
}
if (empty($company)) {
return;
}
company($company_id)->makeCurrent();
$company->makeCurrent();
// Set locale for modules
if (($alias != 'core') && !empty($company->locale)) {
app()->setLocale($company->locale);
}
// Disable model cache during update
config(['laravel-model-caching.enabled' => false]);

2
app/Http/Middleware/CanInstall.php
View File

@ -21,6 +21,6 @@ class CanInstall
}
// Already installed, redirect to login
redirect('auth/login')->send();
return redirect()->route('login');
}
}

5
app/Imports/Common/Sheets/ItemTaxes.php
View File

@ -10,11 +10,6 @@ class ItemTaxes extends Import
{
public function model(array $row)
{
// @todo remove after laravel-excel 3.2 release
if ($row['item_name'] === $this->empty_field) {
return null;
}
return new Model($row);
}

5
app/Imports/Purchases/Sheets/BillHistories.php
View File

@ -11,11 +11,6 @@ class BillHistories extends Import
{
public function model(array $row)
{
// @todo remove after laravel-excel 3.2 release
if ($row['bill_number'] === $this->empty_field) {
return null;
}
return new Model($row);
}

5
app/Imports/Purchases/Sheets/BillItemTaxes.php
View File

@ -13,11 +13,6 @@ class BillItemTaxes extends Import
{
public function model(array $row)
{
// @todo remove after laravel-excel 3.2 release
if ($row['bill_number'] === $this->empty_field) {
return null;
}
return new Model($row);
}

5
app/Imports/Sales/Sheets/InvoiceHistories.php
View File

@ -11,11 +11,6 @@ class InvoiceHistories extends Import
{
public function model(array $row)
{
// @todo remove after laravel-excel 3.2 release
if ($row['invoice_number'] === $this->empty_field) {
return null;
}
return new Model($row);
}

5
app/Imports/Sales/Sheets/InvoiceItemTaxes.php
View File

@ -13,11 +13,6 @@ class InvoiceItemTaxes extends Import
{
public function model(array $row)
{
// @todo remove after laravel-excel 3.2 release
if ($row['invoice_number'] === $this->empty_field) {
return null;
}
return new Model($row);
}

2
app/Traits/Jobs.php
View File

@ -3,7 +3,7 @@
namespace App\Traits;
use Exception;
use Illuminate\Bus\Dispatcher;
use Illuminate\Contracts\Bus\Dispatcher;
use Throwable;
trait Jobs

41
composer.lock generated
View File

@ -344,16 +344,16 @@
},
{
"name": "akaunting/laravel-setting",
"version": "1.2.5",
"version": "1.2.7",
"source": {
"type": "git",
"url": "https://github.com/akaunting/laravel-setting.git",
"reference": "6faedfebd866c3f30efeda58e8a142979ed554b2"
"reference": "10186327e3b93fca56eaa9e4d8ee2ead189f0332"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/akaunting/laravel-setting/zipball/6faedfebd866c3f30efeda58e8a142979ed554b2",
"reference": "6faedfebd866c3f30efeda58e8a142979ed554b2",
"url": "https://api.github.com/repos/akaunting/laravel-setting/zipball/10186327e3b93fca56eaa9e4d8ee2ead189f0332",
"reference": "10186327e3b93fca56eaa9e4d8ee2ead189f0332",
"shasum": ""
},
"require": {
@ -405,9 +405,9 @@
],
"support": {
"issues": "https://github.com/akaunting/laravel-setting/issues",
"source": "https://github.com/akaunting/laravel-setting/tree/1.2.5"
"source": "https://github.com/akaunting/laravel-setting/tree/1.2.7"
},
"time": "2021-03-05T12:10:57+00:00"
"time": "2021-04-23T22:38:26+00:00"
},
{
"name": "akaunting/laravel-version",
@ -1814,40 +1814,39 @@
},
{
"name": "doctrine/cache",
"version": "1.10.2",
"version": "1.11.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/cache.git",
"reference": "13e3381b25847283a91948d04640543941309727"
"reference": "a9c1b59eba5a08ca2770a76eddb88922f504e8e0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/cache/zipball/13e3381b25847283a91948d04640543941309727",
"reference": "13e3381b25847283a91948d04640543941309727",
"url": "https://api.github.com/repos/doctrine/cache/zipball/a9c1b59eba5a08ca2770a76eddb88922f504e8e0",
"reference": "a9c1b59eba5a08ca2770a76eddb88922f504e8e0",
"shasum": ""
},
"require": {
"php": "~7.1 || ^8.0"
},
"conflict": {
"doctrine/common": ">2.2,<2.4"
"doctrine/common": ">2.2,<2.4",
"psr/cache": ">=3"
},
"require-dev": {
"alcaeus/mongo-php-adapter": "^1.1",
"doctrine/coding-standard": "^6.0",
"cache/integration-tests": "dev-master",
"doctrine/coding-standard": "^8.0",
"mongodb/mongodb": "^1.1",
"phpunit/phpunit": "^7.0",
"predis/predis": "~1.0"
"phpunit/phpunit": "^7.0 || ^8.0 || ^9.0",
"predis/predis": "~1.0",
"psr/cache": "^1.0 || ^2.0",
"symfony/cache": "^4.4 || ^5.2"
},
"suggest": {
"alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.9.x-dev"
}
},
"autoload": {
"psr-4": {
"Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache"
@ -1894,7 +1893,7 @@
],
"support": {
"issues": "https://github.com/doctrine/cache/issues",
"source": "https://github.com/doctrine/cache/tree/1.10.x"
"source": "https://github.com/doctrine/cache/tree/1.11.0"
},
"funding": [
{
@ -1910,7 +1909,7 @@
"type": "tidelift"
}
],
"time": "2020-07-07T18:54:01+00:00"
"time": "2021-04-13T14:46:17+00:00"
},
{
"name": "doctrine/collections",

2
database/seeds/Accounts.php
View File

@ -26,8 +26,6 @@ class Accounts extends Seeder
{
$company_id = $this->command->argument('company');
setting()->setExtraColumns(['company_id' => $company_id]);
$account = Account::create([
'company_id' => $company_id,
'name' => trans('demo.accounts.cash'),

16
database/seeds/Categories.php
View File

@ -64,26 +64,28 @@ class Categories extends Seeder
],
];
$income_category = $expense_category = false;
$income_category_id = $expense_category_id = 0;
foreach ($rows as $row) {
$category = Category::create($row);
switch ($category->type) {
case 'income':
if (empty($income_category)) {
$income_category = $category;
if (empty($income_category_id)) {
$income_category_id = $category->id;
}
break;
case 'expense':
if (empty($expense_category)) {
$expense_category = $category;
if (empty($expense_category_id)) {
$expense_category_id = $category->id;
}
break;
}
}
setting()->set('default.income_category', $income_category->id);
setting()->set('default.expense_category', $expense_category->id);
setting()->set('default.income_category', $income_category_id);
setting()->set('default.expense_category', $expense_category_id);
}
}

2
database/seeds/Settings.php
View File

@ -25,8 +25,6 @@ class Settings extends Seeder
{
$company_id = $this->command->argument('company');
setting()->setExtraColumns(['company_id' => $company_id]);
$offline_payments = [
[
'code' => 'offline-payments.cash.1',

2
resources/views/components/documents/show/timeline.blade.php
View File

@ -105,7 +105,7 @@
@stack('timeline_viewed_invoice_body_message_start')
<small>{{ trans_choice('general.statuses', 1) . ':' }}</small>
<small>{{ trans('invoices.messages.status.viewed') }}</small>
@stack('timeline_viewed_invoice_body_message_end'))
@stack('timeline_viewed_invoice_body_message_end')
@elseif($document->status == 'received')
@stack('timeline_receive_bill_body_message_start')
<small>{{ trans_choice('general.statuses', 1) . ':' }}</small>