Skip to content

[FIX] account_statement_import_sheet_file_bg: Fixed JSON file data #376

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

Closed
fw-bot-adhoc wants to merge 1 commit into from
Closed

[FIX] account_statement_import_sheet_file_bg: Fixed JSON file data #376

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
35 changes: 32 additions & 3 deletions account_statement_import_sheet_file_bg/models/account_statement_import.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

from markupsafe import Markup
from odoo import _, models
from odoo.exceptions import UserError
from openpyxl import Workbook, load_workbook


Expand Down Expand Up @@ -37,13 +38,28 @@ def import_file_button(self, wizard_data=None):

if files:
for idx, file in enumerate(files):
# Encode the file to string format, because background jobs cannot
# be executed if the parameters passed are not serializable (the original format is bytes).
# It is decoded back in import_file_button to be processed normally.
csv_or_xls = None
file_str = file
if not isinstance(file, str):
try:
file_bytes = base64.b64decode(file)
file_str = file_bytes.decode("utf-8")
csv_or_xls = "csv"
except Exception:
file_str = base64.b64encode(file_bytes).decode("ascii")
csv_or_xls = "xls"

# Create wizard data to be passed to bg job
wizard_data = {
"statement_file": file,
"statement_file": file_str,
"statement_filename": self.statement_filename,
"sheet_mapping_id": self.sheet_mapping_id.id,
"part_number": idx + 1,
"total_parts": len(files),
"csv_or_xls": csv_or_xls,
}
# Call bg_enqueue on empty recordset and pass data as kwargs
# Add part number to job name for clarity
Expand Down Expand Up @@ -88,6 +104,16 @@ def import_file_button(self, wizard_data=None):
# Extract part info before creating wizard
part_number = wizard_data.pop("part_number", None)
total_parts = wizard_data.pop("total_parts", None)
csv_or_xls = wizard_data.pop("csv_or_xls", None)
# Decode file from string back to bytes based on file type
statement_file = wizard_data.get("statement_file")
if statement_file and isinstance(statement_file, str):
if csv_or_xls == "csv":
# CSV files use UTF-8 encoding
wizard_data["statement_file"] = base64.b64encode(statement_file.encode("utf-8"))
elif csv_or_xls == "xls":
# Excel files are already base64 encoded as ASCII strings
wizard_data["statement_file"] = statement_file.encode("ascii")
wizard = self.create(wizard_data)
else:
wizard = self
Expand Down Expand Up @@ -150,8 +176,11 @@ def split_base64_excel(self, header_rows_count, rows_per_file_limit):
# Get the date column index from the sheet mapping using the parser's method
parser = self.env["account.statement.import.sheet.parser"]
header = parser.parse_header((input_workbook, input_worksheet), self.sheet_mapping_id)
date_column_indexes = parser._get_column_indexes(header, "timestamp_column", self.sheet_mapping_id)
date_column_index = date_column_indexes[0] if date_column_indexes else None
try:
date_column_indexes = parser._get_column_indexes(header, "timestamp_column", self.sheet_mapping_id)
date_column_index = date_column_indexes[0] if date_column_indexes else None
except Exception as e:
raise UserError(_("Error importing bank statement: %s") % str(e))

# Filter out rows where the date column is empty
data_rows = self._filter_rows_with_date(data_rows, date_column_index)
Expand Down