Skip to content

[18.0][FIX] account_statement_import_sheet_file: fix none separator #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jbaudoux wants to merge 1 commit into
base: 18.0-mig-account_statement_import_sheet_file
Choose a base branch
from
Open

[18.0][FIX] account_statement_import_sheet_file: fix none separator #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions account_statement_import_sheet_file/models/account_statement_import_sheet_mapping.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ class AccountStatementImportSheetMapping(models.Model):
string="Decimals Separator",
selection=[("dot", "dot (.)"), ("comma", "comma (,)"), ("none", "none")],
default="comma",
help="When the separator is 'none', the value will be shifted according "
"to the currency decimals. For example, 12345 will be converted to "
"123.45",
)
file_encoding = fields.Selection(
string="Encoding",
Expand Down
12 changes: 11 additions & 1 deletion account_statement_import_sheet_file/models/account_statement_import_sheet_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Copyright 2019 ForgeFlow, S.L.
# Copyright 2020 CorporateHub (https://corporatehub.eu)
# Copyright 2025 Jacques-Etienne Baudoux (BCIM) <je@bcim.be>
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).

import itertools
Expand Down Expand Up @@ -539,5 +540,14 @@ def _parse_decimal(self, value, mapping):
or "0"
)
value = value.replace(thousands, "")
value = value.replace(decimal, ".")
float_separator = "."
if decimal:
value = value.replace(decimal, float_separator)
else:
journal = self.env["account.journal"].browse(
self.env.context.get("journal_id")
)
currency = journal.currency_id or journal.company_id.currency_id
decimal_places = currency.decimal_places if currency else 2
value = value[:-decimal_places] + float_separator + value[-decimal_places:]
return float(value)
1 change: 1 addition & 0 deletions account_statement_import_sheet_file/readme/CONTRIBUTORS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@
- [CorporateHub](https://corporatehub.eu/)
- Alexey Pelykh \<<alexey.pelykh@corphub.eu>\>
- Sebastiano Picchi <sebastiano.picchi@pytech.it>
- Jacques-Etienne Baudoux (BCIM) <je@bcim.be>
8 changes: 8 additions & 0 deletions account_statement_import_sheet_file/tests/test_account_statement_import_sheet_file.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Copyright 2019 ForgeFlow, S.L.
# Copyright 2020 CorporateHub (https://corporatehub.eu)
# Copyright 2025 Jacques-Etienne Baudoux (BCIM) <je@bcim.be>
# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).

from base64 import b64encode
Expand Down Expand Up @@ -55,6 +56,8 @@ def setUpClass(cls):
cls.mock_mapping_comma_dot._get_float_separators.return_value = (",", ".")
cls.mock_mapping_dot_comma = Mock()
cls.mock_mapping_dot_comma._get_float_separators.return_value = (".", ",")
cls.mock_mapping_none_none = Mock()
cls.mock_mapping_none_none._get_float_separators.return_value = ("", "")

def _data_file(self, filename, encoding=None):
mode = "rt" if encoding else "rb"
Expand Down Expand Up @@ -653,6 +656,11 @@ def test_parse_decimal(self):
1234567.89,
self.mock_mapping_dot_comma,
), # inverted separators
(
"123456",
1234.56,
self.mock_mapping_none_none,
), # no separator
]

for value, expected, mock_mapping in test_cases:
Expand Down