From 82821a44d96b06cdf60b6721b6f8d04d45144505 Mon Sep 17 00:00:00 2001 From: AjmalCybro Date: Wed, 11 Jun 2025 12:52:08 +0530 Subject: [PATCH] [FIX] : Jun 11 Updated 'base_accounting_kit' --- base_accounting_kit/__manifest__.py | 2 +- base_accounting_kit/doc/RELEASE_NOTES.md | 4 + .../models/account_asset_asset.py | 1 - .../models/account_bank_statement_line.py | 0 .../static/description/assets/modules/1.gif | Bin .../static/src/js/KanbanController.js | 0 .../static/src/js/ListController.js | 0 .../js/bank_reconcile_form_lines_widget.js | 0 .../src/js/bank_reconcile_form_list_widget.js | 0 .../static/src/scss/bank_rec_widget.css | 0 .../static/src/scss/style.scss | 0 .../static/src/xml/bank_rec_widget.xml | 0 .../static/src/xml/bank_reconcile_widget.xml | 0 .../views/account_bank_statement_views.xml | 0 .../views/account_move_line_views.xml | 0 .../wizard/import_bank_statement.py | 76 ++++++++---------- 16 files changed, 38 insertions(+), 45 deletions(-) mode change 100755 => 100644 base_accounting_kit/models/account_bank_statement_line.py mode change 100755 => 100644 base_accounting_kit/static/description/assets/modules/1.gif mode change 100755 => 100644 base_accounting_kit/static/src/js/KanbanController.js mode change 100755 => 100644 base_accounting_kit/static/src/js/ListController.js mode change 100755 => 100644 base_accounting_kit/static/src/js/bank_reconcile_form_lines_widget.js mode change 100755 => 100644 base_accounting_kit/static/src/js/bank_reconcile_form_list_widget.js mode change 100755 => 100644 base_accounting_kit/static/src/scss/bank_rec_widget.css mode change 100755 => 100644 base_accounting_kit/static/src/scss/style.scss mode change 100755 => 100644 base_accounting_kit/static/src/xml/bank_rec_widget.xml mode change 100755 => 100644 base_accounting_kit/static/src/xml/bank_reconcile_widget.xml mode change 100755 => 100644 base_accounting_kit/views/account_bank_statement_views.xml mode change 100755 => 100644 base_accounting_kit/views/account_move_line_views.xml diff --git a/base_accounting_kit/__manifest__.py b/base_accounting_kit/__manifest__.py index c9858c887..11ecf3ee5 100644 --- a/base_accounting_kit/__manifest__.py +++ b/base_accounting_kit/__manifest__.py @@ -21,7 +21,7 @@ ############################################################################# { 'name': 'Odoo 18 Full Accounting Kit for Community', - 'version': '18.0.3.0.5', + 'version': '18.0.3.0.6', 'category': 'Accounting', 'live_test_url': 'https://kit.easyinstance.com/web/login?redirect=/odoo/accounting', 'summary': """Odoo 18 Accounting, Odoo 18 Accounting Reports, Odoo18 Accounting, Odoo Accounting, Odoo18 Financial Reports, Odoo18 Asset, Odoo18 Profit and Loss, PDC, Followups, Odoo18, Accounting, Odoo Apps, Reports""", diff --git a/base_accounting_kit/doc/RELEASE_NOTES.md b/base_accounting_kit/doc/RELEASE_NOTES.md index 34afce5f2..40b45e87b 100644 --- a/base_accounting_kit/doc/RELEASE_NOTES.md +++ b/base_accounting_kit/doc/RELEASE_NOTES.md @@ -35,3 +35,7 @@ #### UPDT - Updated the generation of asset entry when the confim button click. +#### 11.06.2025 +#### Version 18.0.3.0.6 +#### FIX +- Fixed the CSV bank statement import errors for unformatted files. diff --git a/base_accounting_kit/models/account_asset_asset.py b/base_accounting_kit/models/account_asset_asset.py index cd8eb67f3..a8ccb6ff5 100644 --- a/base_accounting_kit/models/account_asset_asset.py +++ b/base_accounting_kit/models/account_asset_asset.py @@ -148,7 +148,6 @@ class AccountAssetAsset(models.Model): ('category_id.group_entries', '=', False)]) created_move_ids += ungrouped_assets._compute_entries(date, group_entries=False) - print("created_move_ids",created_move_ids) for grouped_category in self.env['account.asset.category'].search( type_domain + [('group_entries', '=', True)]): diff --git a/base_accounting_kit/models/account_bank_statement_line.py b/base_accounting_kit/models/account_bank_statement_line.py old mode 100755 new mode 100644 diff --git a/base_accounting_kit/static/description/assets/modules/1.gif b/base_accounting_kit/static/description/assets/modules/1.gif old mode 100755 new mode 100644 diff --git a/base_accounting_kit/static/src/js/KanbanController.js b/base_accounting_kit/static/src/js/KanbanController.js old mode 100755 new mode 100644 diff --git a/base_accounting_kit/static/src/js/ListController.js b/base_accounting_kit/static/src/js/ListController.js old mode 100755 new mode 100644 diff --git a/base_accounting_kit/static/src/js/bank_reconcile_form_lines_widget.js b/base_accounting_kit/static/src/js/bank_reconcile_form_lines_widget.js old mode 100755 new mode 100644 diff --git a/base_accounting_kit/static/src/js/bank_reconcile_form_list_widget.js b/base_accounting_kit/static/src/js/bank_reconcile_form_list_widget.js old mode 100755 new mode 100644 diff --git a/base_accounting_kit/static/src/scss/bank_rec_widget.css b/base_accounting_kit/static/src/scss/bank_rec_widget.css old mode 100755 new mode 100644 diff --git a/base_accounting_kit/static/src/scss/style.scss b/base_accounting_kit/static/src/scss/style.scss old mode 100755 new mode 100644 diff --git a/base_accounting_kit/static/src/xml/bank_rec_widget.xml b/base_accounting_kit/static/src/xml/bank_rec_widget.xml old mode 100755 new mode 100644 diff --git a/base_accounting_kit/static/src/xml/bank_reconcile_widget.xml b/base_accounting_kit/static/src/xml/bank_reconcile_widget.xml old mode 100755 new mode 100644 diff --git a/base_accounting_kit/views/account_bank_statement_views.xml b/base_accounting_kit/views/account_bank_statement_views.xml old mode 100755 new mode 100644 diff --git a/base_accounting_kit/views/account_move_line_views.xml b/base_accounting_kit/views/account_move_line_views.xml old mode 100755 new mode 100644 diff --git a/base_accounting_kit/wizard/import_bank_statement.py b/base_accounting_kit/wizard/import_bank_statement.py index 9ececcd57..694891970 100644 --- a/base_accounting_kit/wizard/import_bank_statement.py +++ b/base_accounting_kit/wizard/import_bank_statement.py @@ -63,66 +63,56 @@ class ImportBankStatement(models.TransientModel): firstline = False continue # Reading the content from csv file - if file_item.split(',') != ['']: - if file_item.split(',')[0] and file_item.split(',')[1] \ - and file_item.split(',')[4]: - date_obj = str(fields.date.today()) if not \ - file_item.split(',')[3] else \ - file_item.split(',')[ - 3] + values = file_item.split(',') + if len(values) >= 5: + if values[0] and values[1] and values[4]: + date_obj = str(fields.date.today()) if not values[ + 3] else values[3] transaction_date = datetime.strptime(date_obj, "%Y-%m-%d") partner = self.env['res.partner'].search( - [('name', '=', file_item.split(',')[4])]) - # Creating a record in account.bank.statement model + [('name', '=', values[4])]) if partner: statement = self.env[ 'account.bank.statement'].create({ - 'name': file_item.split(',')[0], - 'line_ids': [ - (0, 0, { - 'date': transaction_date, - 'payment_ref': 'csv file', - 'partner_id': partner.id, - 'journal_id': self.journal_id.id, - 'amount': file_item.split(',')[1], - 'amount_currency': - file_item.split(',')[2], - }), - ], + 'name': values[0], + 'line_ids': [(0, 0, { + 'date': transaction_date, + 'payment_ref': 'csv file', + 'partner_id': partner.id, + 'journal_id': self.journal_id.id, + 'amount': values[1], + 'amount_currency': values[2], + })], }) else: - raise ValidationError(_("Partner not exist")) + raise ValidationError( + _("Partner does not exist")) else: - if not file_item.split(',')[0]: + if not values[0]: raise ValidationError( _("Account name is not set")) - elif not file_item.split(',')[1]: - raise ValidationError( - _("Amount is not set")) - elif not file_item.split(',')[4]: + elif not values[1]: + raise ValidationError(_("Amount is not set")) + elif not values[4]: date_obj = str(fields.date.today()) if not \ - file_item.split(',')[3] else \ - file_item.split(',')[ - 3] + values[3] else values[3] transaction_date = datetime.strptime(date_obj, "%Y-%m-%d") - # Creating a record in account.bank.statement model statement = self.env[ 'account.bank.statement'].create({ - 'name': file_item.split(',')[0], - 'line_ids': [ - (0, 0, { - 'date': transaction_date, - 'payment_ref': 'csv file', - 'journal_id': self.journal_id.id, - 'amount': file_item.split(',')[ - 1], - 'amount_currency': - file_item.split(',')[2], - }), - ], + 'name': values[0], + 'line_ids': [(0, 0, { + 'date': transaction_date, + 'payment_ref': 'csv file', + 'journal_id': self.journal_id.id, + 'amount': values[1], + 'amount_currency': values[2], + })], }) + else: + raise ValidationError( + _("Invalid row format in CSV file. Ensure all required columns are present.")) return { 'type': 'ir.actions.act_window', 'name': 'Statements',