kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-16 09:51:16 +00:00
Code Issues Projects Releases Wiki Activity

🤖 Auto commit for release 'develop' on 2025-04-20

Browse Source
This commit is contained in:
JC5
2025-04-20 08:07:31 +02:00
parent 33d73d8be8
commit 66bd786842
6 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Services/Internal/Support/JournalServiceTrait.php
View File

@@ -280,7 +280,7 @@ trait JournalServiceTrait
}
// 2025-04-19 sanity check on IBAN.
$validator = new UniqueIban(null, $preferredType);
if('' !== (string) $data['iban'] && !$validator->passes('iban', $data['iban'])) {
if ('' !== (string) $data['iban'] && !$validator->passes('iban', $data['iban'])) {
Log::warning(sprintf('IBAN "%s" is already in use, quietly ignore it.', $data['iban']));
$data['iban'] = null;
}
@@ -289,7 +289,7 @@ trait JournalServiceTrait
// $data['name'] = $data['name'] ?? '(no name)';
$account = $this->accountRepository->store(
$account = $this->accountRepository->store(
[
'account_type_id' => null,
'account_type_name' => $preferredType,

18
changelog.md
View File

@@ -12,19 +12,19 @@ This project adheres to [Semantic Versioning](http://semver.org/).
### Changed
- #10039
- [PR 10039](https://github.com/firefly-iii/firefly-iii/pull/10039) (update check: consider cron succesfull when disabled or too frequent) reported by @ovv
- Update currency list and update exchange rates
### Fixed
- #9398
- #9858
- #10015
- #10025
- #10068
- #10069
- #10114
- #10150
- [Issue 9398](https://github.com/firefly-iii/firefly-iii/issues/9398) (Expand email settings to allow self-signed certificates) reported by @SoulSeekkor
- [Issue 9858](https://github.com/firefly-iii/firefly-iii/issues/9858) (Homepage "left to spend" count two times an expense with "foreign amount") reported by @M4xS0ch
- [Issue 10015](https://github.com/firefly-iii/firefly-iii/issues/10015) ("It looks like this IBAN is already in use." when editing asset account.) reported by @wolph
- [Issue 10025](https://github.com/firefly-iii/firefly-iii/issues/10025) (Liabilities not counted in income and expenses) reported by @BhasherBEL
- [Issue 10068](https://github.com/firefly-iii/firefly-iii/issues/10068) (Export Data isn't exporting all transactions in the data) reported by @firsttiger
- [Issue 10069](https://github.com/firefly-iii/firefly-iii/issues/10069) (Undefined array key "foreign_currency_decimal_places") reported by @akong-carbon6
- [Issue 10114](https://github.com/firefly-iii/firefly-iii/issues/10114) (Budget for foreign currency not getting updated when a transaction refers to it) reported by @srikakulamts
- [Issue 10150](https://github.com/firefly-iii/firefly-iii/issues/10150) (Mass deletion of initial balance throws 404 and doesn't delete) reported by @Tyler-Angell
## 6.2.10 - 2025-03-22

2
config/firefly.php
View File

@@ -78,7 +78,7 @@ return [
'running_balance_column' => env('USE_RUNNING_BALANCE', false),
// see cer.php for exchange rates feature flag.
],
'version' => 'develop/2025-04-19',
'version' => 'develop/2025-04-20',
'api_version' => '2.1.0', // field is no longer used.
'db_version' => 25,

26
package-lock.json generated
View File

@@ -4420,9 +4420,9 @@
}
},
"node_modules/caniuse-lite": {
"version": "1.0.30001714",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001714.tgz",
"integrity": "sha512-mtgapdwDLSSBnCI3JokHM7oEQBLxiJKVRtg10AxM1AyeiKcM96f0Mkbqeq+1AbiCtvMcHRulAAEMu693JrSWqg==",
"version": "1.0.30001715",
"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001715.tgz",
"integrity": "sha512-7ptkFGMm2OAOgvZpwgA4yjQ5SQbrNVGdRjzH0pBdy1Fasvcr+KAeECmbCAECzTuDuoX0FCY8KzUxjf9+9kfZEw==",
"dev": true,
"funding": [
{
@@ -11015,13 +11015,13 @@
}
},
"node_modules/tinyglobby": {
"version": "0.2.12",
"resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.12.tgz",
"integrity": "sha512-qkf4trmKSIiMTs/E63cxH+ojC2unam7rJ0WrauAzpT3ECNTxGRMlaXxVbfxMUC/w0LaYk6jQ4y/nGR9uBO3tww==",
"version": "0.2.13",
"resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.13.tgz",
"integrity": "sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==",
"dev": true,
"license": "MIT",
"dependencies": {
"fdir": "^6.4.3",
"fdir": "^6.4.4",
"picomatch": "^4.0.2"
},
"engines": {
@@ -11032,9 +11032,9 @@
}
},
"node_modules/tinyglobby/node_modules/fdir": {
"version": "6.4.3",
"resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.3.tgz",
"integrity": "sha512-PMXmW2y1hDDfTSRc9gaXIuCCRpuoz3Kaz8cUelp3smouvfT632ozg2vrT6lJsHKKOF59YLbOGfAWGUcKEfRMQw==",
"version": "6.4.4",
"resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz",
"integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==",
"dev": true,
"license": "MIT",
"peerDependencies": {
@@ -11442,9 +11442,9 @@
"license": "MIT"
},
"node_modules/vite/node_modules/fdir": {
"version": "6.4.3",
"resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.3.tgz",
"integrity": "sha512-PMXmW2y1hDDfTSRc9gaXIuCCRpuoz3Kaz8cUelp3smouvfT632ozg2vrT6lJsHKKOF59YLbOGfAWGUcKEfRMQw==",
"version": "6.4.4",
"resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz",
"integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==",
"dev": true,
"license": "MIT",
"peerDependencies": {

2
resources/assets/v1/src/locales/de.json
View File

@@ -2,7 +2,7 @@
"firefly": {
"administrations_page_title": "Finanzverwaltungen",
"administrations_index_menu": "Finanzverwaltung",
"expires_at": "Expires at",
"expires_at": "G\u00fcltig bis",
"temp_administrations_introduction": "Firefly III wird bald die M\u00f6glichkeit erhalten, mehrere Finanzverwaltungen zu verwalten. Im Moment verf\u00fcgen Sie nur \u00fcber eine. Sie k\u00f6nnen den Titel dieser Verwaltung und ihre eigene W\u00e4hrung festlegen. Dies ersetzt die bisherige Einstellung, bei der Sie Ihre \u201eStandardw\u00e4hrung\u201c festlegen konnten. Diese Einstellung ist jetzt an die Finanzverwaltung gebunden und kann f\u00fcr jede Verwaltung unterschiedlich sein.",
"administration_currency_form_help": "Es kann l\u00e4nger dauern, bis die Seite geladen ist, wenn Sie die Landesw\u00e4hrung \u00e4ndern, da die Buchungen m\u00f6glicherweise in Ihre (neue) Landesw\u00e4hrung umgerechnet werden m\u00fcssen.",
"administrations_page_edit_sub_title_js": "Finanzverwaltung \u201e{title}\u201c bearbeiten",

50
resources/assets/v1/src/locales/pt-br.json
View File

@@ -1,11 +1,11 @@
{
"firefly": {
"administrations_page_title": "Financial administrations",
"administrations_index_menu": "Financial administrations",
"expires_at": "Expires at",
"temp_administrations_introduction": "Firefly III will soon get the ability to manage multiple financial administrations. Right now, you only have the one. You can set the title of this administration and its native currency. This replaces the previous setting where you would set your \"default currency\". This setting is now tied to the financial administration and can be different per administration.",
"administration_currency_form_help": "It may take a long time for the page to load if you change the native currency because transaction may need to be converted to your (new) native currency.",
"administrations_page_edit_sub_title_js": "Edit financial administration \"{title}\"",
"administrations_page_title": "Administra\u00e7\u00e3o financeira",
"administrations_index_menu": "Administra\u00e7\u00e3o financeira",
"expires_at": "Expira em",
"temp_administrations_introduction": "O Firefly III ter\u00e1 em breve a capacidade de gerir m\u00faltiplas administra\u00e7\u00f5es financeiras. Neste momento, voc\u00ea tem apenas um. Voc\u00ea pode definir o t\u00edtulo desta administra\u00e7\u00e3o e sua moeda nativa. Isso substitui a configura\u00e7\u00e3o anterior onde voc\u00ea definiria sua \"moeda padr\u00e3o\". Esta defini\u00e7\u00e3o est\u00e1 agora ligada \u00e0 administra\u00e7\u00e3o financeira e pode ser diferente por administra\u00e7\u00e3o.",
"administration_currency_form_help": "A p\u00e1gina poder\u00e1 levar muito tempo para ser carregada, se voc\u00ea alterar a moeda nativa, porque a transa\u00e7\u00e3o precisar\u00e1 ser convertida para a sua (nova) moeda nativa.",
"administrations_page_edit_sub_title_js": "Editar administra\u00e7\u00e3o financeira \"{title}\"",
"table": "Tabela",
"welcome_back": "O que est\u00e1 acontecendo?",
"flash_error": "Erro!",
@@ -16,11 +16,11 @@
"select_source_account": "Por favor, selecione ou digite um nome de conta de origem v\u00e1lido",
"split_transaction_title": "Descri\u00e7\u00e3o da transa\u00e7\u00e3o dividida",
"errors_submission": "Algo deu errado com seu envio. Por favor, verifique os erros abaixo.",
"is_reconciled": "Is reconciled",
"is_reconciled": "Est\u00e1 reconciliado",
"split": "Dividir",
"single_split": "Divis\u00e3o",
"not_enough_currencies": "Not enough currencies",
"not_enough_currencies_enabled": "If you have just one currency enabled, there is no need to add exchange rates.",
"not_enough_currencies": "Moedas insuficientes",
"not_enough_currencies_enabled": "Se voc\u00ea tem apenas uma moeda ativada, n\u00e3o h\u00e1 necessidade de adicionar taxas de c\u00e2mbio.",
"transaction_stored_link": "<a href=\"transactions\/show\/{ID}\">Transa\u00e7\u00e3o #{ID} (\"{title}\")<\/a> foi salva.",
"webhook_stored_link": "<a href=\"transactions\/show\/{ID}\">Webhooh #{ID} (\"{title}\")<\/a> foi salva.",
"webhook_updated_link": "<a href=\"webhooks\/show\/{ID}\">Webhook #{ID}<\/a> (\"{title}\") foi atualizado.",
@@ -31,7 +31,7 @@
"apply_rules_checkbox": "Aplicar regras",
"fire_webhooks_checkbox": "Acionar webhooks",
"no_budget_pointer": "Parece que voc\u00ea ainda n\u00e3o tem or\u00e7amentos. Voc\u00ea deve criar alguns na p\u00e1gina de <a href=\"budgets\">or\u00e7amentos<\/a>. Or\u00e7amentos podem ajud\u00e1-lo a manter o controle das despesas.",
"no_bill_pointer": "You seem to have no subscription yet. You should create some on the <a href=\"subscriptions\">subscription<\/a>-page. Subscriptions can help you keep track of expenses.",
"no_bill_pointer": "Parece que voc\u00ea n\u00e3o tem assinatura ainda. Voc\u00ea deve criar alguma na p\u00e1gina de <a href=\"subscriptions\">assinaturas<\/a>. Assinaturas podem ajud\u00e1-lo a manter o controle das despesas.",
"source_account": "Conta origem",
"hidden_fields_preferences": "Voc\u00ea pode habilitar mais op\u00e7\u00f5es de transa\u00e7\u00e3o em suas <a href=\"preferences\">prefer\u00eancias<\/a>.",
"destination_account": "Conta destino",
@@ -43,10 +43,10 @@
"submit": "Enviar",
"amount": "Valor",
"date": "Data",
"is_reconciled_fields_dropped": "Because this transaction is reconciled, you will not be able to update the accounts, nor the amount(s) unless you remove the reconciliation flag.",
"is_reconciled_fields_dropped": "Como a transa\u00e7\u00e3o est\u00e1 reconciliada, voc\u00ea n\u00e3o pode atualizar as contas, nem o(s) valor(es) at\u00e9 voc\u00ea remover o indicador de reconcilia\u00e7\u00e3o.",
"tags": "Tags",
"no_budget": "(sem or\u00e7amento)",
"no_bill": "(no subscription)",
"no_bill": "(sem assinatura)",
"category": "Categoria",
"attachments": "Anexos",
"notes": "Notas",
@@ -62,7 +62,7 @@
"destination_account_reconciliation": "Voc\u00ea n\u00e3o pode editar a conta destino de uma transa\u00e7\u00e3o de reconcilia\u00e7\u00e3o.",
"source_account_reconciliation": "Voc\u00ea n\u00e3o pode editar a conta de origem de uma transa\u00e7\u00e3o de reconcilia\u00e7\u00e3o.",
"budget": "Or\u00e7amento",
"bill": "Subscription",
"bill": "Assinatura",
"you_create_withdrawal": "Voc\u00ea est\u00e1 criando uma sa\u00edda.",
"you_create_transfer": "Voc\u00ea est\u00e1 criando uma transfer\u00eancia.",
"you_create_deposit": "Voc\u00ea est\u00e1 criando uma entrada.",
@@ -140,21 +140,21 @@
"response": "Resposta",
"visit_webhook_url": "Acesse a URL do webhook",
"reset_webhook_secret": "Redefinir chave do webhook",
"header_exchange_rates": "Exchange rates",
"exchange_rates_intro": "Firefly III supports downloading and using exchange rates. Read more about this in <a href=\"https:\/\/docs.firefly-iii.org\/explanation\/financial-concepts\/exchange-rates\/\">the documentation<\/a>.",
"exchange_rates_from_to": "Between {from} and {to} (and the other way around)",
"exchange_rates_intro_rates": "Firefly III uses the following exchange rates. The inverse is automatically calculated when it is not provided. If no exchange rate exists for the date of the transaction, Firefly III will go back in time to find one. If none are present, the rate \"1\" will be used.",
"header_exchange_rates_rates": "Exchange rates",
"header_exchange_rates_table": "Table with exchange rates",
"help_rate_form": "On this day, how many {to} will you get for one {from}?",
"add_new_rate": "Add a new exchange rate",
"save_new_rate": "Save new rate"
"header_exchange_rates": "Taxa de c\u00e2mbio",
"exchange_rates_intro": "O Firefly III suporta o download e uso de taxas de c\u00e2mbio. Leia mais sobre isso <a href=\"https:\/\/docs.firefly-iii.org\/explanation\/financial-concepts\/exchange-rates\/\">na documenta\u00e7\u00e3o<\/a>.",
"exchange_rates_from_to": "Entre {from} e {to} (e vice-versa)",
"exchange_rates_intro_rates": "O Firefly III usa as seguintes taxas de c\u00e2mbio. A inversa \u00e9 automaticamente calculada quando n\u00e3o \u00e9 fornecida. Se n\u00e3o existir nenhuma taxa de c\u00e2mbio para a data da transa\u00e7\u00e3o, o Firefly III voltar\u00e1 no tempo para encontrar uma. Se nenhum estiver presente, a taxa \"1\" ser\u00e1 usada.",
"header_exchange_rates_rates": "Taxa de c\u00e2mbio",
"header_exchange_rates_table": "Tabela com taxas de c\u00e2mbio",
"help_rate_form": "Neste dia, quantos {to} voc\u00ea receber\u00e1 por um {from}?",
"add_new_rate": "Adicionar uma nova taxa de c\u00e2mbio",
"save_new_rate": "Salvar nova taxa"
},
"form": {
"url": "URL",
"active": "Ativo",
"interest_date": "Data do juros",
"administration_currency": "Native currency",
"administration_currency": "Moeda nativa",
"title": "T\u00edtulo",
"date": "Data",
"book_date": "Data de lan\u00e7amento",
@@ -169,12 +169,12 @@
"webhook_delivery": "Entrega",
"from_currency_to_currency": "{from} &rarr; {to}",
"to_currency_from_currency": "{to} &rarr; {from}",
"rate": "Rate"
"rate": "Taxa"
},
"list": {
"title": "T\u00edtulo",
"active": "Est\u00e1 ativo?",
"native_currency": "Native currency",
"native_currency": "Moeda nativa",
"trigger": "Gatilho",
"response": "Resposta",
"delivery": "Entrega",