Skip to content

Fork Sync Branch 19.0 #17

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

Merged
btl-bot merged 1 commit into from
Sep 17, 2026
Merged

Fork Sync Branch 19.0 #17

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
28 changes: 13 additions & 15 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 @@ -168,8 +168,7 @@ def split_base64_excel(self, header_rows_count, rows_per_file_limit):

output_base64_list = []
mapping = self.sheet_mapping_id
journal = self.env["account.journal"].browse(self.env.context.get("journal_id"))
currency_code = (journal.currency_id or journal.company_id.currency_id).name
all_rows = []
try:
file_bytes = base64.b64decode(self.statement_file)
read_buffer = BytesIO(file_bytes)
Expand All @@ -191,6 +190,9 @@ def split_base64_excel(self, header_rows_count, rows_per_file_limit):
)
sheet = workbook.sheet_by_index(0)
csv_or_xlsx = (workbook, sheet)
# same as the openpyxl branch: plain values, every row and
# every column, which is what the split below writes out
all_rows = [sheet.row_values(row) for row in range(sheet.nrows)]

except Exception:
# Try CSV
Expand All @@ -211,24 +213,20 @@ def split_base64_excel(self, header_rows_count, rows_per_file_limit):

csv_reader = reader(StringIO(decoded), **csv_options)
csv_or_xlsx = csv_reader
all_rows = [row for row in list(csv_or_xlsx) if any(cell for cell in row)]
# same as the two spreadsheet branches: every row, empty ones
# included, so that the header row number the user configured
# counts the lines the file actually has. Dropping the empty
# rows here shifted that count and made the header land on a
# transaction. Empty rows are skipped later by the parser,
# which is what skip_empty_lines is for.
all_rows = list(csv_or_xlsx)
parser = self.env["account.statement.import.sheet.parser"]

# Only parse header and rows for Excel files (when all_rows is not yet populated)
if not all_rows:
header = parser.parse_header(csv_or_xlsx, mapping)
columns = dict()
for column_name in parser._get_column_names():
columns[column_name] = parser._get_column_indexes(header, column_name, mapping)
data = csv_or_xlsx, self.statement_file
all_rows = parser._parse_rows(mapping, currency_code, data, columns)
else:
# For CSV files, we already have all_rows, convert list to iterator for parse_header
header = parser.parse_header(iter(all_rows), mapping)

if not all_rows:
return []

header = parser.parse_header(iter(all_rows), mapping)

header_rows = all_rows[:header_rows_count]
data_rows = all_rows[header_rows_count:]

Expand Down
3 changes: 0 additions & 3 deletions account_statement_import_sheet_file_bg/models/account_statement_import_sheet_parser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ def parse_header(self, csv_or_xlsx, mapping):
if header_line > 0:
header_line -= 1

if isinstance(csv_or_xlsx, tuple):
return super().parse_header(csv_or_xlsx, mapping)

[next(csv_or_xlsx) for _i in range(header_line)]
header = []
for value in next(csv_or_xlsx):
Expand Down
Loading