Skip to content

Commit

Permalink
minor tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
bvontress committed Jun 17, 2024
1 parent bf87aca commit 1ee2e67
Show file tree
Hide file tree
Showing 15 changed files with 48 additions and 16 deletions.
6 changes: 4 additions & 2 deletions docs/user_faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ The user adds the tokens to the `assets` field of the [config file](input_files.
RP2 currently supports the following accounting methods:
* US: [FIFO](https://www.investopedia.com/terms/f/fifo.asp), [LIFO](https://www.investopedia.com/terms/l/lifo.asp) and [HIFO](https://www.investopedia.com/terms/h/hifo.asp). Note that these methods use universal application (not per-wallet application), as explained [here](https://www.forbes.com/sites/shehanchandrasekera/2020/09/17/what-crypto-taxpayers-need-to-know-about-fifo-lifo-hifo-specific-id/);
* Spain: FIFO;
* Japan: Total Average Method.
* Japan: Total Average Method;
* Ireland: FIFO.

### Can I Change Accounting Method?
Yes, for countries that support more than one accounting method, you can select which one to use via the `-m` command line option.
Expand All @@ -98,7 +99,8 @@ Yes, for countries that support more than one accounting method, you can select
Currently the following countries are supported:
* US;
* Japan;
* Spain.
* Spain;
* Ireland.

However more countries are being added. As new countries are added this FAQ will be updated.

Expand Down
Binary file modified src/rp2/locales/en/LC_MESSAGES/messages.mo
Binary file not shown.
2 changes: 1 addition & 1 deletion src/rp2/locales/en/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: rp2 1.0.6\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2024-06-16 06:59+0100\n"
"POT-Creation-Date: 2024-06-17 06:28+0100\n"
"PO-Revision-Date: 2022-08-10 12:38-0700\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: en\n"
Expand Down
Binary file modified src/rp2/locales/en_IE/LC_MESSAGES/messages.mo
Binary file not shown.
4 changes: 2 additions & 2 deletions src/rp2/locales/en_IE/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
#
msgid ""
msgstr ""
"Project-Id-Version: rp2 1.4.2\n"
"Project-Id-Version: rp2 1.5.1\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2024-06-16 06:59+0100\n"
"POT-Creation-Date: 2024-06-17 06:28+0100\n"
"PO-Revision-Date: 2024-06-16 06:56+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: en_IE\n"
Expand Down
Binary file modified src/rp2/locales/es/LC_MESSAGES/messages.mo
Binary file not shown.
2 changes: 1 addition & 1 deletion src/rp2/locales/es/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: rp2 1.4.2\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2024-06-16 06:59+0100\n"
"POT-Creation-Date: 2024-06-17 06:28+0100\n"
"PO-Revision-Date: 2023-04-27 20:23+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: es\n"
Expand Down
Binary file modified src/rp2/locales/ja/LC_MESSAGES/messages.mo
Binary file not shown.
2 changes: 1 addition & 1 deletion src/rp2/locales/ja/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: rp2 1.0.6\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2024-06-16 06:59+0100\n"
"POT-Creation-Date: 2024-06-17 06:28+0100\n"
"PO-Revision-Date: 2022-08-11 21:50-0700\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: ja\n"
Expand Down
Binary file modified src/rp2/locales/kl/LC_MESSAGES/messages.mo
Binary file not shown.
2 changes: 1 addition & 1 deletion src/rp2/locales/kl/LC_MESSAGES/messages.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: rp2 1.0.6\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2024-06-16 06:59+0100\n"
"POT-Creation-Date: 2024-06-17 06:28+0100\n"
"PO-Revision-Date: 2022-08-10 19:04-0700\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: kl\n"
Expand Down
2 changes: 1 addition & 1 deletion src/rp2/locales/messages.pot
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: rp2 1.5.1\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2024-06-16 06:59+0100\n"
"POT-Creation-Date: 2024-06-17 06:28+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down
2 changes: 1 addition & 1 deletion src/rp2/plugin/country/ie.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2021 eprbell
# Copyright 2024 advidb
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/rp2/plugin/report/ie/tax_report_ie.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2021 eprbell
# Copyright 2024 advidb
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
40 changes: 35 additions & 5 deletions tests/test_ods_output_diff_ie.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2022 Neal Chambers
# Copyright 2024 advidb
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -40,16 +40,46 @@ def setUpClass(cls) -> None:
generation_language="en_IE",
allow_negative_balances=True,
)

AbstractTestODSOutputDiff._generate(
cls.output_dir, test_name="test_data", config="test_data", method="fifo", country="ie", generation_language="en_IE", allow_negative_balances=True
cls.output_dir,
test_name="test_data",
config="test_data",
method="fifo",
country="ie",
generation_language="en_IE",
allow_negative_balances=True,
)

AbstractTestODSOutputDiff._generate(
cls.output_dir, test_name="test_data2", config="test_data", method="fifo", country="ie", generation_language="en_IE", allow_negative_balances=True
cls.output_dir,
test_name="test_data2",
config="test_data",
method="fifo",
country="ie",
generation_language="en_IE",
allow_negative_balances=True,
)

AbstractTestODSOutputDiff._generate(
cls.output_dir, test_name="test_data3", config="test_data", method="fifo", country="ie", generation_language="en_IE", allow_negative_balances=True
cls.output_dir,
test_name="test_data3",
config="test_data",
method="fifo",
country="ie",
generation_language="en_IE",
allow_negative_balances=True,
)

AbstractTestODSOutputDiff._generate(
cls.output_dir,
test_name="test_data4",
config="test_data4",
method="fifo",
country="ie",
generation_language="en_IE",
)
AbstractTestODSOutputDiff._generate(cls.output_dir, test_name="test_data4", config="test_data4", method="fifo", country="ie", generation_language="en_IE")

AbstractTestODSOutputDiff._generate(
cls.output_dir,
test_name="test_many_year_data",
Expand Down

0 comments on commit 1ee2e67

Please sign in to comment.