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-03-01 16:22:33 +03:00
commit fa11d5564d
24 changed files with 180 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Utilities/Recurring.php
View File

@ -39,7 +39,7 @@ class Recurring
// Days between invoiced/billed and due date
$diff_days = Date::parse($clone->due_at)->diffInDays(Date::parse($clone->$issued_date_field));
$clone->due_at = $start_date->addDays($diff_days)->format('Y-m-d');
$clone->due_at = $start_date->copy()->addDays($diff_days)->format('Y-m-d');
}
$clone->parent_id = $item->id;

109
composer.lock generated
View File

@ -209,16 +209,16 @@
},
{
"name": "akaunting/module",
"version": "2.0.3",
"version": "2.0.5",
"source": {
"type": "git",
"url": "https://github.com/akaunting/module.git",
"reference": "5443dc1667f3bcabc46e06b5eb679572ae2ac462"
"reference": "d4b82b8f25d8ef1d220b68f23e0b20946037822a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/akaunting/module/zipball/5443dc1667f3bcabc46e06b5eb679572ae2ac462",
"reference": "5443dc1667f3bcabc46e06b5eb679572ae2ac462",
"url": "https://api.github.com/repos/akaunting/module/zipball/d4b82b8f25d8ef1d220b68f23e0b20946037822a",
"reference": "d4b82b8f25d8ef1d220b68f23e0b20946037822a",
"shasum": ""
},
"require": {
@ -273,9 +273,9 @@
],
"support": {
"issues": "https://github.com/akaunting/module/issues",
"source": "https://github.com/akaunting/module/tree/2.0.3"
"source": "https://github.com/akaunting/module/tree/2.0.5"
},
"time": "2021-02-16T19:56:17+00:00"
"time": "2021-02-25T11:15:01+00:00"
},
{
"name": "akaunting/money",
@ -1115,16 +1115,16 @@
},
{
"name": "composer/composer",
"version": "2.0.9",
"version": "2.0.11",
"source": {
"type": "git",
"url": "https://github.com/composer/composer.git",
"reference": "591c2c155cac0d2d7f34af41d3b1e29bcbfc685e"
"reference": "a5a5632da0b1c2d6fa9a3b65f1f4e90d1f04abb9"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/composer/composer/zipball/591c2c155cac0d2d7f34af41d3b1e29bcbfc685e",
"reference": "591c2c155cac0d2d7f34af41d3b1e29bcbfc685e",
"url": "https://api.github.com/repos/composer/composer/zipball/a5a5632da0b1c2d6fa9a3b65f1f4e90d1f04abb9",
"reference": "a5a5632da0b1c2d6fa9a3b65f1f4e90d1f04abb9",
"shasum": ""
},
"require": {
@ -1192,7 +1192,7 @@
"support": {
"irc": "irc://irc.freenode.org/composer",
"issues": "https://github.com/composer/composer/issues",
"source": "https://github.com/composer/composer/tree/2.0.9"
"source": "https://github.com/composer/composer/tree/2.0.11"
},
"funding": [
{
@ -1208,7 +1208,7 @@
"type": "tidelift"
}
],
"time": "2021-01-27T15:09:27+00:00"
"time": "2021-02-24T13:57:23+00:00"
},
{
"name": "composer/semver",
@ -1678,16 +1678,16 @@
},
{
"name": "doctrine/annotations",
"version": "1.11.1",
"version": "1.12.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/annotations.git",
"reference": "ce77a7ba1770462cd705a91a151b6c3746f9c6ad"
"reference": "b17c5014ef81d212ac539f07a1001832df1b6d3b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/annotations/zipball/ce77a7ba1770462cd705a91a151b6c3746f9c6ad",
"reference": "ce77a7ba1770462cd705a91a151b6c3746f9c6ad",
"url": "https://api.github.com/repos/doctrine/annotations/zipball/b17c5014ef81d212ac539f07a1001832df1b6d3b",
"reference": "b17c5014ef81d212ac539f07a1001832df1b6d3b",
"shasum": ""
},
"require": {
@ -1702,11 +1702,6 @@
"phpunit/phpunit": "^7.5 || ^9.1.5"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.11.x-dev"
}
},
"autoload": {
"psr-4": {
"Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations"
@ -1747,9 +1742,9 @@
],
"support": {
"issues": "https://github.com/doctrine/annotations/issues",
"source": "https://github.com/doctrine/annotations/tree/1.11.1"
"source": "https://github.com/doctrine/annotations/tree/1.12.1"
},
"time": "2020-10-26T10:28:16+00:00"
"time": "2021-02-21T21:00:45+00:00"
},
{
"name": "doctrine/cache",
@ -4527,16 +4522,16 @@
},
{
"name": "laravel/framework",
"version": "v8.28.1",
"version": "v8.29.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "73dd43d92fcde6c6abc00658ae33391397ca119d"
"reference": "d2eba352b3b3a3c515b18c5726b373fe5026733e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/73dd43d92fcde6c6abc00658ae33391397ca119d",
"reference": "73dd43d92fcde6c6abc00658ae33391397ca119d",
"url": "https://api.github.com/repos/laravel/framework/zipball/d2eba352b3b3a3c515b18c5726b373fe5026733e",
"reference": "d2eba352b3b3a3c515b18c5726b373fe5026733e",
"shasum": ""
},
"require": {
@ -4644,7 +4639,7 @@
"phpunit/phpunit": "Required to use assertions and run tests (^8.5.8|^9.3.3).",
"predis/predis": "Required to use the predis connector (^1.1.2).",
"psr/http-message": "Required to allow Storage::put to accept a StreamInterface (^1.0).",
"pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^4.0).",
"pusher/pusher-php-server": "Required to use the Pusher broadcast driver (^4.0|^5.0).",
"symfony/cache": "Required to PSR-6 cache bridge (^5.1.4).",
"symfony/filesystem": "Required to enable support for relative symbolic links (^5.1.4).",
"symfony/psr-http-message-bridge": "Required to use PSR-7 bridging features (^2.0).",
@ -4691,7 +4686,7 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2021-02-16T18:07:44+00:00"
"time": "2021-02-23T14:27:41+00:00"
},
{
"name": "laravel/tinker",
@ -5470,23 +5465,23 @@
},
{
"name": "maatwebsite/excel",
"version": "3.1.26",
"version": "3.1.27",
"source": {
"type": "git",
"url": "https://github.com/Maatwebsite/Laravel-Excel.git",
"reference": "66f7c9584304ad0b6a267a5d8ffbfa2ff4272e85"
"reference": "584d65427eae4de0ba072297c8fac9b0d63dbc37"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/66f7c9584304ad0b6a267a5d8ffbfa2ff4272e85",
"reference": "66f7c9584304ad0b6a267a5d8ffbfa2ff4272e85",
"url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/584d65427eae4de0ba072297c8fac9b0d63dbc37",
"reference": "584d65427eae4de0ba072297c8fac9b0d63dbc37",
"shasum": ""
},
"require": {
"ext-json": "*",
"illuminate/support": "5.8.*|^6.0|^7.0|^8.0",
"php": "^7.0|^8.0",
"phpoffice/phpspreadsheet": "^1.15"
"phpoffice/phpspreadsheet": "^1.16"
},
"require-dev": {
"orchestra/testbench": "^6.0",
@ -5532,7 +5527,7 @@
],
"support": {
"issues": "https://github.com/Maatwebsite/Laravel-Excel/issues",
"source": "https://github.com/Maatwebsite/Laravel-Excel/tree/3.1.26"
"source": "https://github.com/Maatwebsite/Laravel-Excel/tree/3.1.27"
},
"funding": [
{
@ -5544,7 +5539,7 @@
"type": "github"
}
],
"time": "2020-11-27T16:17:38+00:00"
"time": "2021-02-22T16:58:19+00:00"
},
{
"name": "maennchen/zipstream-php",
@ -5857,16 +5852,16 @@
},
{
"name": "mobiledetect/mobiledetectlib",
"version": "2.8.36",
"version": "2.8.37",
"source": {
"type": "git",
"url": "https://github.com/serbanghita/Mobile-Detect.git",
"reference": "e55c155f4d1ab299a0cfca8ec29a0154918c9e3d"
"reference": "9841e3c46f5bd0739b53aed8ac677fa712943df7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/e55c155f4d1ab299a0cfca8ec29a0154918c9e3d",
"reference": "e55c155f4d1ab299a0cfca8ec29a0154918c9e3d",
"url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/9841e3c46f5bd0739b53aed8ac677fa712943df7",
"reference": "9841e3c46f5bd0739b53aed8ac677fa712943df7",
"shasum": ""
},
"require": {
@ -5907,9 +5902,15 @@
],
"support": {
"issues": "https://github.com/serbanghita/Mobile-Detect/issues",
"source": "https://github.com/serbanghita/Mobile-Detect/tree/2.8.36"
"source": "https://github.com/serbanghita/Mobile-Detect/tree/2.8.37"
},
"time": "2021-02-13T14:35:52+00:00"
"funding": [
{
"url": "https://github.com/serbanghita",
"type": "github"
}
],
"time": "2021-02-19T21:22:57+00:00"
},
{
"name": "moneyphp/money",
@ -11883,16 +11884,16 @@
},
{
"name": "mockery/mockery",
"version": "1.4.2",
"version": "1.4.3",
"source": {
"type": "git",
"url": "https://github.com/mockery/mockery.git",
"reference": "20cab678faed06fac225193be281ea0fddb43b93"
"reference": "d1339f64479af1bee0e82a0413813fe5345a54ea"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/mockery/mockery/zipball/20cab678faed06fac225193be281ea0fddb43b93",
"reference": "20cab678faed06fac225193be281ea0fddb43b93",
"url": "https://api.github.com/repos/mockery/mockery/zipball/d1339f64479af1bee0e82a0413813fe5345a54ea",
"reference": "d1339f64479af1bee0e82a0413813fe5345a54ea",
"shasum": ""
},
"require": {
@ -11949,9 +11950,9 @@
],
"support": {
"issues": "https://github.com/mockery/mockery/issues",
"source": "https://github.com/mockery/mockery/tree/master"
"source": "https://github.com/mockery/mockery/tree/1.4.3"
},
"time": "2020-08-11T18:10:13+00:00"
"time": "2021-02-24T09:51:49+00:00"
},
{
"name": "myclabs/deep-copy",
@ -12161,16 +12162,16 @@
},
{
"name": "phar-io/version",
"version": "3.0.4",
"version": "3.1.0",
"source": {
"type": "git",
"url": "https://github.com/phar-io/version.git",
"reference": "e4782611070e50613683d2b9a57730e9a3ba5451"
"reference": "bae7c545bef187884426f042434e561ab1ddb182"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phar-io/version/zipball/e4782611070e50613683d2b9a57730e9a3ba5451",
"reference": "e4782611070e50613683d2b9a57730e9a3ba5451",
"url": "https://api.github.com/repos/phar-io/version/zipball/bae7c545bef187884426f042434e561ab1ddb182",
"reference": "bae7c545bef187884426f042434e561ab1ddb182",
"shasum": ""
},
"require": {
@ -12206,9 +12207,9 @@
"description": "Library for handling version information and constraints",
"support": {
"issues": "https://github.com/phar-io/version/issues",
"source": "https://github.com/phar-io/version/tree/3.0.4"
"source": "https://github.com/phar-io/version/tree/3.1.0"
},
"time": "2020-12-13T23:18:30+00:00"
"time": "2021-02-23T14:00:09+00:00"
},
{
"name": "phpspec/prophecy",

6
config/version.php
View File

@ -10,15 +10,15 @@ return [
'minor' => '1',
'patch' => '3',
'patch' => '4',
'build' => '',
'status' => 'Stable',
'date' => '15-February-2020',
'date' => '28-February-2020',
'time' => '15:00',
'time' => '13:00',
'zone' => 'GMT +3',

1
resources/lang/az-AZ/items.php
View File

@ -4,5 +4,6 @@ return [
'sales_price' => 'Satış Qiyməti',
'purchase_price' => 'Alış Qiyməti',
'enter_item_description' => 'Məhsul/Xidmət Açıqlamasını daxil edin',
];

6
resources/lang/az-AZ/settings.php
View File

@ -8,6 +8,7 @@ return [
'email' => 'Şirkət E-poçtu',
'phone' => 'Telefon',
'address' => 'Şirkət Ünvanı',
'edit_your_business_address' => 'Hüquqi ünvanınızı daxil edin',
'logo' => 'Şirkət Logosu',
],
@ -15,6 +16,11 @@ return [
'description' => 'Maliyyə ilinin başlanğıcını, saat qurşağını, tarix formatını və s. dəyişdirin.',
'financial_start' => 'Maliyyə ilinin başlanğıcı',
'timezone' => 'Saat Qurşağı',
'financial_denote' => [
'title' => 'Maliyyə ilini qeyd edin',
'begins' => 'Başlanğıc il',
'ends' => 'Bitiş il',
],
'date' => [
'format' => 'Tarix Formatı',
'separator' => 'Tarix Ayracı',

2
resources/lang/da-DK/general.php
View File

@ -189,7 +189,7 @@ return [
'file' => 'Vælg fil',
],
'add' => 'Tilføj en :field',
'add_an' => 'Tilføj et :field',
'add_an' => 'Tilføj en :field',
'add_new' => 'Tilføj nyt :field',
'edit' => 'Rediger :field',
'contact_edit' => 'Rediger :contact_name :field',

2
resources/lang/de-DE/general.php
View File

@ -187,7 +187,7 @@ return [
'field' => '- :field auswählen -',
'file' => 'Datei auswählen',
],
'add' => ':field neu hinzufügen',
'add' => ':field hinzufügen',
'add_an' => ':field neu hinzufügen',
'add_new' => ':field neu hinzufügen',
'edit' => ':field bearbeiten',

1
resources/lang/es-AR/items.php
View File

@ -4,5 +4,6 @@ return [
'sales_price' => 'Precio de venta',
'purchase_price' => 'Precio de compra',
'enter_item_description' => 'Introducir descripción del artículo',
];

1
resources/lang/es-AR/reports.php
View File

@ -2,6 +2,7 @@
return [
'years' => 'Año|Años',
'this_year' => 'Este año',
'previous_year' => 'Año Anterior',
'this_quarter' => 'Este trimestre',

6
resources/lang/es-AR/settings.php
View File

@ -8,6 +8,7 @@ return [
'email' => 'Correo electrónico',
'phone' => 'Teléfono',
'address' => 'Dirección',
'edit_your_business_address' => 'Editar la dirección de su empresa',
'logo' => 'Logo',
],
@ -15,6 +16,11 @@ return [
'description' => 'Establecer año fiscal, zona horaria, formato de fecha y más locales',
'financial_start' => 'Inicio del ejercicio financiero',
'timezone' => 'Zona horaria',
'financial_denote' => [
'title' => 'Año fiscal indicado',
'begins' => 'Por el año en que comienza',
'ends' => 'Por el año en que termina',
],
'date' => [
'format' => 'Formato de fecha',
'separator' => 'Separador de fecha',

2
resources/lang/mk-MK/auth.php
View File

@ -13,6 +13,7 @@ return [
'current_email' => 'Е-маил адреса',
'reset' => 'Ресетирај',
'never' => 'Никогаш',
'landing_page' => 'Почетна страница',
'password' => [
'current' => 'Лозинка',
@ -23,6 +24,7 @@ return [
'error' => [
'self_delete' => 'Грешка: Неможете да се избришете самите!',
'self_disable' => 'Грешка: Неможете да се оневозможите самите!',
'no_company' => 'Грешка: Ниедна компанија не е додадена во вашиот профил. Ве молиме контактирајте го системскиот администратор.',
],

23
resources/lang/mk-MK/errors.php Normal file
View File

@ -0,0 +1,23 @@
<?php
return [
'title' => [
'403' => 'Забранет пристап!',
'404' => 'Страницата не е најдена.',
'500' => 'Нешто не е во ред',
],
'header' => [
'403' => 'Забранет пристап',
'404' => 'Не е пронајдена',
'500' => 'Серверска грешка',
],
'message' => [
'403' => 'Немате пристап до оваа страница.',
'404' => 'Неможеме да ја пронајдеме страницата која ја барате.',
'500' => 'Работиме за да го решиме проблемот.',
],
];

3
resources/lang/mk-MK/pagination.php
View File

@ -4,6 +4,7 @@ return [
'previous' => '« Назад',
'next' => 'Напред »',
'showing' => 'Прикажување :first to :last of :total :type',
'showing' => ':first-:last од :total :type записи',
'page' => 'на страна.',
];

2
resources/lang/mk-MK/recurring.php
View File

@ -10,7 +10,7 @@ return [
'weekly' => 'Неделно',
'monthly' => 'Месечно',
'yearly' => 'Годишно',
'custom' => 'Произволно',
'custom' => 'Прилагодено',
'days' => 'Ден(денови)',
'weeks' => 'Неделно(недели)',
'months' => 'месец/и',

4
resources/lang/mk-MK/transfers.php
View File

@ -2,8 +2,8 @@
return [
'from_account' => 'Од акаунт',
'to_account' => 'На акаунт',
'from_account' => 'Од Сметка',
'to_account' => 'На сметка',
'messages' => [
'delete' => ':од на :на (:износ)',

10
resources/lang/mk-MK/validation.php
View File

@ -39,6 +39,7 @@ return [
'dimensions' => ':attribute има неважечки димензии на сликата.',
'distinct' => 'Полето :attribute има дупликат вредност.',
'email' => 'Полето :attribute не е во валиден формат.',
'ends_with' => 'Атрибутот :attribute мора да завршува со следниве вредности: :values',
'exists' => 'Избранато поле :attribute веќе постои.',
'file' => ':attribute мора да биде датотека.',
'filled' => 'Полето :attribute е задолжително.',
@ -60,7 +61,7 @@ return [
'numeric' => 'Полето :attribute мора да биде минимум :min.',
'file' => 'Полето :attribute мора да биде минимум :min килобајти.',
'string' => 'Полето :attribute мора да има минимум :min карактери.',
'array' => 'Полето :attribute мора да има минимум :min карактери.',
'array' => 'Атрибутот :attribute мора да има минимум :min ставки.',
],
'not_in' => 'Избраното поле :attribute е невалидно.',
'numeric' => 'Полето :attribute мора да биде број.',
@ -78,7 +79,7 @@ return [
'numeric' => 'Полето :attribute мора да биде :size.',
'file' => 'Полето :attribute мора да биде :size килобајти.',
'string' => 'Полето :attribute мора да има :size карактери.',
'array' => 'Полето :attribute мора да има :size карактери.',
'array' => 'Атрибутот :attribute мора да има :size ставки.',
],
'string' => ':attribute мора да биде стринг.',
'timezone' => ':attribute мора да биде валидна зона.',
@ -99,10 +100,11 @@ return [
'custom' => [
'attribute-name' => [
'rule-name' => 'Порака',
'rule-name' => 'Прилагодена порака',
],
'invalid_currency' => 'Полето :attribute не е во валиден формат.',
'invalid_amount' => 'The amount :attribute is invalid.',
'invalid_amount' => 'Вредноста на :attribute не е валидна.',
'invalid_extension' => 'Екстензијата на датотеката не е валидна.',
],
/*

23
resources/lang/mk-MK/widgets.php Normal file
View File

@ -0,0 +1,23 @@
<?php
return [
'total_income' => 'Вкупно приходи',
'receivables' => 'Побарувања',
'open_invoices' => 'Отворени фактури',
'overdue_invoices' => 'Доспеани фактури',
'total_expenses' => 'Вкупно трошоци',
'payables' => 'Плаќања',
'open_bills' => 'Отворени сметки',
'overdue_bills' => 'Доспеани сметки',
'total_profit' => 'Вкупно профит',
'open_profit' => 'Нето профит',
'overdue_profit' => 'Доспеан профит',
'cash_flow' => 'Тек на готовина',
'no_profit_loss' => 'Без загуба на профит',
'income_by_category' => 'Приход по Категорија',
'expenses_by_category' => 'Трошоци по Категорија',
'account_balance' => 'Состјба на сметка',
'latest_income' => 'Последни приходи',
'latest_expenses' => 'Последни трошоци',
];

1
resources/lang/ms-MY/currencies.php
View File

@ -8,6 +8,7 @@ return [
'decimal_mark' => 'Tanda Perpuluhan',
'thousands_separator' => 'Pemisah Nombor Ribu',
'precision' => 'Ketepatan',
'conversion' => 'Tukaran mata wang',
'symbol' => [
'symbol' => 'Simbol',
'position' => 'Posisi Simbol',

1
resources/lang/pt-BR/items.php
View File

@ -4,5 +4,6 @@ return [
'sales_price' => 'Preço de Venda',
'purchase_price' => 'Preço de Compra',
'enter_item_description' => 'Digite a descrição do item',
];

2
resources/lang/pt-BR/search_string.php
View File

@ -13,6 +13,8 @@ return [
'issued_at' => 'Data de emissão',
'symbol_first' => 'Posição do símbolo',
'reconciled' => 'Reconciliado',
'expense_account' => 'Da conta',
'income_account' => 'Para conta',
],
];

2
resources/lang/sv-SE/general.php
View File

@ -81,7 +81,7 @@ return [
'delete_confirm' => 'Bekräfta ta bort :name :type?',
'name' => 'Namn',
'email' => 'E-post',
'tax_number' => 'Skattenummer',
'tax_number' => 'Org.nr/Momsreg.nr',
'phone' => 'Telefon',
'address' => 'Adress',
'website' => 'Webbplats',

1
resources/lang/sv-SE/items.php
View File

@ -4,5 +4,6 @@ return [
'sales_price' => 'Försäljningspris',
'purchase_price' => 'Inköpspris',
'enter_item_description' => 'Ange varubeskrivning',
];

2
resources/lang/sv-SE/search_string.php
View File

@ -13,6 +13,8 @@ return [
'issued_at' => 'Utfärdad Datum',
'symbol_first' => 'Symbolplacering',
'reconciled' => 'Avstämd',
'expense_account' => 'Från konto',
'income_account' => 'Till konto',
],
];

6
resources/lang/sv-SE/settings.php
View File

@ -8,6 +8,7 @@ return [
'email' => 'E-post',
'phone' => 'Telefon',
'address' => 'Adress',
'edit_your_business_address' => 'Redigera din företagsadress',
'logo' => 'Logotyp',
],
@ -15,6 +16,11 @@ return [
'description' => 'Ställ in räkenskapsår, tidszon, datumformat och andra lokala inställningar',
'financial_start' => 'Räkenskapsår',
'timezone' => 'Tidszon',
'financial_denote' => [
'title' => 'Räkenskapsårets Beteckning',
'begins' => 'Efter startår',
'ends' => 'Efter slutår',
],
'date' => [
'format' => 'Datumformat',
'separator' => 'Datumavgränsare',