diff --git a/account_statement_import_sheet_file/README.rst b/account_statement_import_sheet_file/README.rst
index 15e7b9ff..fe5319e1 100644
--- a/account_statement_import_sheet_file/README.rst
+++ b/account_statement_import_sheet_file/README.rst
@@ -14,13 +14,13 @@ Bank Statement TXT/CSV/XLSX Import
:target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
:alt: License: AGPL-3
.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fbank--statement--import-lightgray.png?logo=github
- :target: https://github.com/OCA/bank-statement-import/tree/14.0/account_statement_import_txt_xlsx
+ :target: https://github.com/OCA/bank-statement-import/tree/15.0/account_statement_import_txt_xlsx
:alt: OCA/bank-statement-import
.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
- :target: https://translation.odoo-community.org/projects/bank-statement-import-14-0/bank-statement-import-14-0-account_statement_import_txt_xlsx
+ :target: https://translation.odoo-community.org/projects/bank-statement-import-15-0/bank-statement-import-15-0-account_statement_import_txt_xlsx
:alt: Translate me on Weblate
.. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
- :target: https://runbot.odoo-community.org/runbot/174/14.0
+ :target: https://runbot.odoo-community.org/runbot/174/15.0
:alt: Try me on Runbot
|badge1| |badge2| |badge3| |badge4| |badge5|
@@ -66,7 +66,7 @@ Bug Tracker
Bugs are tracked on `GitHub Issues `_.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us smashing it by providing a detailed and welcomed
-`feedback `_.
+`feedback `_.
Do not contact contributors directly about support or help with technical issues.
@@ -119,6 +119,6 @@ Current `maintainer `__:
|maintainer-alexey-pelykh|
-This module is part of the `OCA/bank-statement-import `_ project on GitHub.
+This module is part of the `OCA/bank-statement-import `_ project on GitHub.
You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/account_statement_import_sheet_file/__manifest__.py b/account_statement_import_sheet_file/__manifest__.py
index a6e8bd1c..3dbd1590 100644
--- a/account_statement_import_sheet_file/__manifest__.py
+++ b/account_statement_import_sheet_file/__manifest__.py
@@ -5,7 +5,7 @@
{
"name": "Bank Statement TXT/CSV/XLSX Import",
"summary": "Import TXT/CSV or XLSX files as Bank Statements in Odoo",
- "version": "14.0.1.0.1",
+ "version": "15.0.1.0.0",
"category": "Accounting",
"website": "https://github.com/OCA/bank-statement-import",
"author": "ForgeFlow, CorporateHub, Odoo Community Association (OCA)",
diff --git a/account_statement_import_sheet_file/i18n/account_statement_import_txt_xlsx.pot b/account_statement_import_sheet_file/i18n/account_statement_import_txt_xlsx.pot
index bbcd4975..572b06e7 100644
--- a/account_statement_import_sheet_file/i18n/account_statement_import_txt_xlsx.pot
+++ b/account_statement_import_sheet_file/i18n/account_statement_import_txt_xlsx.pot
@@ -4,7 +4,7 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: Odoo Server 14.0\n"
+"Project-Id-Version: Odoo Server 15.0\n"
"Report-Msgid-Bugs-To: \n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -27,7 +27,7 @@ msgstr ""
#. module: account_statement_import_txt_xlsx
#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping__amount_column
#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping_wizard__amount_column
-msgid "Amount column"
+msgid "Amount Column"
msgstr ""
#. module: account_statement_import_txt_xlsx
@@ -37,15 +37,15 @@ msgid "Amount of transaction in journal's currency"
msgstr ""
#. module: account_statement_import_txt_xlsx
-#: model:ir.model.fields,help:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping__balance_column
-#: model:ir.model.fields,help:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping_wizard__balance_column
-msgid "Balance after transaction in journal's currency"
+#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping__balance_column
+#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping_wizard__balance_column
+msgid "Balance Column"
msgstr ""
#. module: account_statement_import_txt_xlsx
-#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping__balance_column
-#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping_wizard__balance_column
-msgid "Balance column"
+#: model:ir.model.fields,help:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping__balance_column
+#: model:ir.model.fields,help:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping_wizard__balance_column
+msgid "Balance after transaction in journal's currency"
msgstr ""
#. module: account_statement_import_txt_xlsx
@@ -56,13 +56,13 @@ msgstr ""
#. module: account_statement_import_txt_xlsx
#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping__bank_account_column
#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping_wizard__bank_account_column
-msgid "Bank Account column"
+msgid "Bank Account Column"
msgstr ""
#. module: account_statement_import_txt_xlsx
#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping__bank_name_column
#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping_wizard__bank_name_column
-msgid "Bank Name column"
+msgid "Bank Name Column"
msgstr ""
#. module: account_statement_import_txt_xlsx
@@ -113,13 +113,13 @@ msgstr ""
#. module: account_statement_import_txt_xlsx
#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping__credit_value
#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping_wizard__credit_value
-msgid "Credit value"
+msgid "Credit Value"
msgstr ""
#. module: account_statement_import_txt_xlsx
#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping__currency_column
#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping_wizard__currency_column
-msgid "Currency column"
+msgid "Currency Column"
msgstr ""
#. module: account_statement_import_txt_xlsx
@@ -140,7 +140,7 @@ msgstr ""
#. module: account_statement_import_txt_xlsx
#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping__debit_value
#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping_wizard__debit_value
-msgid "Debit value"
+msgid "Debit Value"
msgstr ""
#. module: account_statement_import_txt_xlsx
@@ -173,12 +173,10 @@ msgstr ""
#. module: account_statement_import_txt_xlsx
#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping__description_column
#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping_wizard__description_column
-msgid "Description column"
+msgid "Description Column"
msgstr ""
#. module: account_statement_import_txt_xlsx
-#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_journal__display_name
-#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import__display_name
#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping__display_name
#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping_wizard__display_name
#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_parser__display_name
@@ -202,8 +200,6 @@ msgid "Header"
msgstr ""
#. module: account_statement_import_txt_xlsx
-#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_journal__id
-#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import__id
#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping__id
#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping_wizard__id
#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_parser__id
@@ -267,8 +263,6 @@ msgid "Journal"
msgstr ""
#. module: account_statement_import_txt_xlsx
-#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_journal____last_update
-#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import____last_update
#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping____last_update
#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping_wizard____last_update
#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_parser____last_update
@@ -310,7 +304,7 @@ msgstr ""
#. module: account_statement_import_txt_xlsx
#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping__notes_column
#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping_wizard__notes_column
-msgid "Notes column"
+msgid "Notes Column"
msgstr ""
#. module: account_statement_import_txt_xlsx
@@ -321,19 +315,19 @@ msgstr ""
#. module: account_statement_import_txt_xlsx
#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping__original_amount_column
#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping_wizard__original_amount_column
-msgid "Original amount column"
+msgid "Original Amount Column"
msgstr ""
#. module: account_statement_import_txt_xlsx
#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping__original_currency_column
#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping_wizard__original_currency_column
-msgid "Original currency column"
+msgid "Original Currency Column"
msgstr ""
#. module: account_statement_import_txt_xlsx
#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping__partner_name_column
#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping_wizard__partner_name_column
-msgid "Partner Name column"
+msgid "Partner Name Column"
msgstr ""
#. module: account_statement_import_txt_xlsx
@@ -351,7 +345,7 @@ msgstr ""
#. module: account_statement_import_txt_xlsx
#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping__reference_column
#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping_wizard__reference_column
-msgid "Reference column"
+msgid "Reference Column"
msgstr ""
#. module: account_statement_import_txt_xlsx
@@ -405,14 +399,14 @@ msgid "Thousands Separator"
msgstr ""
#. module: account_statement_import_txt_xlsx
-#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping__timestamp_format
-msgid "Timestamp Format"
+#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping__timestamp_column
+#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping_wizard__timestamp_column
+msgid "Timestamp Column"
msgstr ""
#. module: account_statement_import_txt_xlsx
-#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping__timestamp_column
-#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping_wizard__timestamp_column
-msgid "Timestamp column"
+#: model:ir.model.fields,field_description:account_statement_import_txt_xlsx.field_account_statement_import_sheet_mapping__timestamp_format
+msgid "Timestamp Format"
msgstr ""
#. module: account_statement_import_txt_xlsx
diff --git a/account_statement_import_sheet_file/models/account_statement_import_sheet_mapping.py b/account_statement_import_sheet_file/models/account_statement_import_sheet_mapping.py
index 4d7e7b57..70d11b5d 100644
--- a/account_statement_import_sheet_file/models/account_statement_import_sheet_mapping.py
+++ b/account_statement_import_sheet_file/models/account_statement_import_sheet_mapping.py
@@ -43,7 +43,6 @@ class AccountStatementImportSheetMapping(models.Model):
default="utf-8",
)
delimiter = fields.Selection(
- string="Delimiter",
selection=[
("dot", "dot (.)"),
("comma", "comma (,)"),
@@ -55,26 +54,22 @@ class AccountStatementImportSheetMapping(models.Model):
default="comma",
)
quotechar = fields.Char(string="Text qualifier", size=1, default='"')
- timestamp_format = fields.Char(string="Timestamp Format", required=True)
- timestamp_column = fields.Char(string="Timestamp column", required=True)
+ timestamp_format = fields.Char(required=True)
+ timestamp_column = fields.Char(required=True)
currency_column = fields.Char(
- string="Currency column",
help=(
"In case statement is multi-currency, column to get currency of "
"transaction from"
),
)
amount_column = fields.Char(
- string="Amount column",
required=True,
help="Amount of transaction in journal's currency",
)
balance_column = fields.Char(
- string="Balance column",
help="Balance after transaction in journal's currency",
)
original_currency_column = fields.Char(
- string="Original currency column",
help=(
"In case statement provides original currency for transactions "
"with automatic currency conversion, column to get original "
@@ -82,7 +77,6 @@ class AccountStatementImportSheetMapping(models.Model):
),
)
original_amount_column = fields.Char(
- string="Original amount column",
help=(
"In case statement provides original currency for transactions "
"with automatic currency conversion, column to get original "
@@ -97,36 +91,24 @@ class AccountStatementImportSheetMapping(models.Model):
),
)
debit_value = fields.Char(
- string="Debit value",
help="Value of debit/credit column that indicates if it's a debit",
default="D",
)
credit_value = fields.Char(
- string="Credit value",
help="Value of debit/credit column that indicates if it's a credit",
default="C",
)
transaction_id_column = fields.Char(
string="Unique transaction ID column",
)
- description_column = fields.Char(
- string="Description column",
- )
- notes_column = fields.Char(
- string="Notes column",
- )
- reference_column = fields.Char(
- string="Reference column",
- )
- partner_name_column = fields.Char(
- string="Partner Name column",
- )
+ description_column = fields.Char()
+ notes_column = fields.Char()
+ reference_column = fields.Char()
+ partner_name_column = fields.Char()
bank_name_column = fields.Char(
- string="Bank Name column",
help="Partner's bank",
)
bank_account_column = fields.Char(
- string="Bank Account column",
help="Partner's bank account",
)
diff --git a/account_statement_import_sheet_file/models/account_statement_import_sheet_parser.py b/account_statement_import_sheet_file/models/account_statement_import_sheet_parser.py
index 460bfe56..61571545 100644
--- a/account_statement_import_sheet_file/models/account_statement_import_sheet_parser.py
+++ b/account_statement_import_sheet_file/models/account_statement_import_sheet_parser.py
@@ -36,7 +36,7 @@ class AccountStatementImportSheetParser(models.TransientModel):
values = sheet.row_values(0)
return [str(value) for value in values]
except xlrd.XLRDError:
- pass
+ _logger.error("Pass this method")
data = StringIO(data_file.decode(encoding or "utf-8"))
csv_data = reader(data, **csv_options)
diff --git a/account_statement_import_sheet_file/static/description/index.html b/account_statement_import_sheet_file/static/description/index.html
index 88ea98fa..aa8381c4 100644
--- a/account_statement_import_sheet_file/static/description/index.html
+++ b/account_statement_import_sheet_file/static/description/index.html
@@ -367,7 +367,7 @@ ul.auto-toc {
!! This file is generated by oca-gen-addon-readme !!
!! changes will be overwritten. !!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-

+

This module allows you to import any TXT/CSV or XLSX file in Odoo as bank
statements.
Table of contents
@@ -421,7 +421,7 @@ statements.
Bugs are tracked on GitHub Issues.
In case of trouble, please check there if your issue has already been reported.
If you spotted it first, help us smashing it by providing a detailed and welcomed
-feedback.
+feedback.
Do not contact contributors directly about support or help with technical issues.
diff --git a/account_statement_import_sheet_file/tests/test_account_statement_import_txt_xlsx.py b/account_statement_import_sheet_file/tests/test_account_statement_import_txt_xlsx.py
index 9236b16f..0ffecd93 100644
--- a/account_statement_import_sheet_file/tests/test_account_statement_import_txt_xlsx.py
+++ b/account_statement_import_sheet_file/tests/test_account_statement_import_txt_xlsx.py
@@ -17,6 +17,8 @@ class TestAccountBankStatementImportTxtXlsx(common.TransactionCase):
self.now = fields.Datetime.now()
self.currency_eur = self.env.ref("base.EUR")
self.currency_usd = self.env.ref("base.USD")
+ # Activate EUR for unit test, by default is not active
+ self.currency_eur.active = True
self.sample_statement_map = self.env.ref(
"account_statement_import_txt_xlsx.sample_statement_map"
)
diff --git a/account_statement_import_sheet_file/wizards/account_statement_import_sheet_mapping_wizard.py b/account_statement_import_sheet_file/wizards/account_statement_import_sheet_mapping_wizard.py
index 2e38de4b..47f4eeab 100644
--- a/account_statement_import_sheet_file/wizards/account_statement_import_sheet_mapping_wizard.py
+++ b/account_statement_import_sheet_file/wizards/account_statement_import_sheet_mapping_wizard.py
@@ -26,33 +26,26 @@ class AccountStatementImportSheetMappingWizard(models.TransientModel):
selection=lambda self: self._selection_file_encoding(),
)
delimiter = fields.Selection(
- string="Delimiter",
selection=lambda self: self._selection_delimiter(),
)
quotechar = fields.Char(
string="Text qualifier",
size=1,
)
- timestamp_column = fields.Char(
- string="Timestamp column",
- )
+ timestamp_column = fields.Char()
currency_column = fields.Char(
- string="Currency column",
help=(
"In case statement is multi-currency, column to get currency of "
"transaction from"
),
)
amount_column = fields.Char(
- string="Amount column",
help="Amount of transaction in journal's currency",
)
balance_column = fields.Char(
- string="Balance column",
help="Balance after transaction in journal's currency",
)
original_currency_column = fields.Char(
- string="Original currency column",
help=(
"In case statement provides original currency for transactions "
"with automatic currency conversion, column to get original "
@@ -60,7 +53,6 @@ class AccountStatementImportSheetMappingWizard(models.TransientModel):
),
)
original_amount_column = fields.Char(
- string="Original amount column",
help=(
"In case statement provides original currency for transactions "
"with automatic currency conversion, column to get original "
@@ -75,36 +67,24 @@ class AccountStatementImportSheetMappingWizard(models.TransientModel):
),
)
debit_value = fields.Char(
- string="Debit value",
help="Value of debit/credit column that indicates if it's a debit",
default="D",
)
credit_value = fields.Char(
- string="Credit value",
help="Value of debit/credit column that indicates if it's a credit",
default="C",
)
transaction_id_column = fields.Char(
string="Unique transaction ID column",
)
- description_column = fields.Char(
- string="Description column",
- )
- notes_column = fields.Char(
- string="Notes column",
- )
- reference_column = fields.Char(
- string="Reference column",
- )
- partner_name_column = fields.Char(
- string="Partner Name column",
- )
+ description_column = fields.Char()
+ notes_column = fields.Char()
+ reference_column = fields.Char()
+ partner_name_column = fields.Char()
bank_name_column = fields.Char(
- string="Bank Name column",
help="Partner's bank",
)
bank_account_column = fields.Char(
- string="Bank Account column",
help="Partner's bank account",
)